Merge remote-tracking branch 'origin/develop' into develop

docs/network.html

@@ -1152,8 +1152,8 @@ var options = {
   </tr>
 
   <tr>
-  <td>style</td>
-      <td class="greenField">string</td>
+  <td class="greenField">style</td>
+      <td>string</td>
       <td>line</td>
       <td>Define a line style for the edge.
       Choose from <code>line</code> (default), <code>arrow</code>,