a
Merge branch 'master' of https://github.com/dramosti/Magnificus2014

Conflicts:
	View/WPF/HLP.Magnificus.View.WPF/HLP.Magnificus.View.WPF.csproj