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

Conflicts:
	HLP.OrganizePlanilha.UI.Web/HLP.OrganizePlanilha.UI.Web.v12.suo
a