Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura

This is a manual merge. I did a checkout on specific files from another branch

That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them

This way of merging bypasses all problems we had with the standard merges from 2.1 into master

CURA-1349

resources/profiles/general/Low+Quality.cfg

@@ -4,15 +4,12 @@ name = Low Quality
 weight = -1
 
 [settings]
+infill_sparse_density = 10
 layer_height = 0.15
-shell_thickness = 0.8
-infill_sparse_density = 8
-speed_print = 60
+cool_min_layer_time = 3
 speed_wall_0 = 40
 speed_wall_x = 80
 speed_infill = 100
 wall_thickness = 1
 speed_topbottom = 30
-speed_travel = 150
-speed_layer_0 = 30
-skirt_speed = 30
+

resources/profiles/general/Normal+Quality.cfg

@@ -5,4 +5,4 @@ weight = -2
 
 [settings]
 speed_topbottom = 15
-speed_infill = 80
+speed_infill = 80

resources/profiles/general/Ulti+Quality.cfg

@@ -6,4 +6,4 @@ weight = -4
 [settings]
 layer_height = 0.04
 speed_topbottom = 15
-speed_infill = 80
+speed_infill = 80

resources/profiles/ultimaker2+/abs_0.4_fast.curaprofile

@@ -22,4 +22,5 @@ speed_wall_0 = 30
 cool_min_layer_time = 3
 cool_min_speed = 20
 cool_lift_head = True
-cool_fan_speed_min = 50
+cool_fan_speed_min = 50
+