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

Conflicts:
	Comum/HLP.Comum.Resources/Styles/mainStyle.xaml
	View/WPF/HLP.Magnificus.View.WPF/App.xaml.cs