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

Conflicts:
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.WindowTeste/bin/Debug/HLP.Controls.pdb
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.csprojResolveAssemblyReference.cache
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls/bin/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls.g.resources
	HLP.Controls/obj/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.cache
d