many fixes and changes
Merge branch 'erik' of https://github.com/MareinK/mmi-paint into erik

Conflicts:
	MMI-Paint/MMI-Paint/ViewModels/UserControls/LayerViewModel.cs
	MMI-Paint/MMI-Paint/Views/UserControls/LayerView3D.xaml.cs