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

Conflicts:
	HLP.Resources.View.WPF/Styles/Components/UserControlStyles.xaml