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

Conflicts:
	HLP.Comum.View.WPF/WinConnectionConfig.xaml
Merge branch 'master' of https://github.com/dramosti/Magnificus2014
a