Merge branch 'new-settings' into devel

Fixes T51

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

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/ABS/High/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/ABS/Low/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/ABS/Normal/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/HIPS/High/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/HIPS/Low/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/HIPS/Normal/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/PLA/High/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/PLA/Low/profile.ini
Simple merge

diff --cc resources/quickprint/lulzbot_TAZ_5_05nozzle/PLA/Normal/profile.ini
Simple merge