* 'master' of github.com:ultimaker/Cura: (49 commits)
15.10 restyling of the sidebar header
15.10 restyling of the sidebar header
15.10 restyling of the sidebar
split magic_mesh)surface_mode into Normal, Surface, Both
Added preference to disable automatic scale
Removed unused import
Added changeLog plugin
Added missing )
Merging of mine and Jaimes work
Removed font from rectangle
JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
Code style & switch to translation catalog
15.10 re-alignment of the toolbar
15.10 New Icons
15.10 restyling of the savebutton Area
Added message asking about sending data to server
Added exception handling for checking overlap.
Fixed default button for general and view page
Fixed double ID in qml
Removed unused import
...
