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

Conflicts:
	Comum/HLP.Comum.Resources/Styles/mainStyle.xaml
a
Merge branch 'master' of https://github.com/dramosti/Magnificus2014
watermark
Merge branch 'master' of https://github.com/dramosti/Magnificus2014