* '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
...
* 'master' of github.com:ultimaker/Cura: (98 commits)
15.10 Restyling of the message stack
Fixed machine head polygons
Removed unused settings from fdmprinter
Added action for togling fullscreen
Fixed usage of wrong checkbox in viewpage
Added preference to disable automatic push free
Added preference to disable auto center when selecting object
Cleanup
15.10 Restyling toolbar, viewmode button
Update README.md
Update README.md
Added rudementary 3 point bed leveling
15.10 New font for Cura
15.10 Changes the styling for the open file button
15.10 Changes the label names for the different action buttons
Fixed typo
Endstop now stops listening upon destruction
15.10 Re-alignment of the messagestack
Cleaned up code a bit
Added heated bed check
...
