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

Conflicts:
	HLP.Controls.Wcf/bin/HLP.Controls.Wcf.pdb
	HLP.Controls.Wcf/bin/HLP.Controls.pdb
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.csprojResolveAssemblyReference.cache
	HLP.Controls.Wcf/obj/Debug/HLP.Controls.Wcf.pdb
	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/HLP.Controls.WindowTeste_MarkupCompile.i.cache
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.baml
	HLP.Controls.WindowTeste/obj/Debug/MainWindow.g.cs
	HLP.Controls.v12.suo
	HLP.Controls/obj/Debug/Component/HlpComboBox.g.cs
	HLP.Controls/obj/Debug/Component/HlpComboBox.g.i.cs
	HLP.Controls/obj/Debug/HLP.Controls.csproj.FileListAbsolute.txt
	HLP.Controls/obj/Debug/HLP.Controls.g.resources
	HLP.Controls/obj/Debug/HLP.Controls.pdb
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.cache
Ajustes
Merge branch 'master' of https://github.com/dramosti/HLP.Controls

Conflicts:
	HLP.Controls.v12.suo
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.cache