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

Conflicts:
	Comum/HLP.Comum.Resources/Styles/Main/MainWindow_Templates.xaml