Merge branch '2.1' into 2.2

# Conflicts:
#	gns3server/compute/iou/iou_vm.py
#	gns3server/compute/virtualbox/virtualbox_vm.py
#	gns3server/compute/vmware/vmware_vm.py

gns3server/controller/topology.py

@@ -83,6 +83,7 @@ def project_to_topology(project):
         "show_layers": project.show_layers,
         "snap_to_grid": project.snap_to_grid,
         "show_grid": project.show_grid,
+        "grid_size": project.grid_size,
         "show_interface_labels": project.show_interface_labels,
         "topology": {
             "nodes": [],