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

Conflicts:
	HLP.Controls/obj/Debug/HLP.Controls_MarkupCompile.i.cache
Ajutes