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

Conflicts:
	HLP.Components.View.WPF/ucTextBoxIntellisense.xaml