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

Conflicts:
	HLP.Controls.WindowTeste/MainWindow.xaml
	HLP.Controls.WindowTeste/MainWindow.xaml.cs
	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.g.resources
	HLP.Controls.WindowTeste/obj/Debug/HLP.Controls.WindowTeste.pdb
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.baml
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.g.cs
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.g.i.cs
	HLP.Controls.v12.suo
	HLP.Controls/obj/Debug/HLP.Controls.g.resources
	HLP.Controls/obj/Debug/HLP.Controls.pdb
Merge branch 'master' of https://github.com/dramosti/HLP.Controls
a