Merge conflic solved

Merge branch 'master' of github.com:daid/Cura

Conflicts:
	Cura/util/profile.py

diff --cc Cura/cura_sf/fabmetheus_utilities/settings.py
Simple merge

diff --cc Cura/gui/opengl.py
Simple merge

diff --cc Cura/util/profile.py
index 0b903e882e805bf097377a28b6ea99da3989a858,3bdfbb2cba979b4bed76b0313dc6c315b9ce4e60..7f999961ba59ec91aff4b1190a0c9438f00b7cdb
--- 1/Cura/util/profile.py
--- 2/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@@ -64,10 -64,8 +64,10 @@@ profileDefaultSettings = 
        'bridge_material_amount': '100',\r
        'raft_margin': '5',\r
        'raft_base_material_amount': '100',\r
--      'raft_interface_material_amount': '100',\r
-       'bottom_thickness': '0.0',\r
++      'raft_interface_material_amount': '100',
+       'bottom_thickness': '0.3',\r
 +      'add_start_end_gcode': 'True',\r
-       'gcode_extension': 'gcode',\r
++      'gcode_extension': 'gcode',
  }\r
  preferencesDefaultSettings = {\r
        'wizardDone': 'False',\r