bug
Merge branch 'master' of https://github.com/dramosti/HLP.Controls

Conflicts:
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste_MarkupCompile.i.cache
	HLP.Controls.v12.suo
	HLP.Controls/Resources/Styles/UserControlStyles.xaml
	HLP.Controls/bin/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls.g.resources