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

Conflicts:
	HLP.OrganizePlanilha.UI.Web/HLP.OrganizePlanilha.UI.Web.v12.suo
	HLP.OrganizePlanilha.UI.Web/HLP.OrganizePlanilha.UI.Web/Controllers/MaquinaController.cs
	HLP.OrganizePlanilha.UI.Web/HLP.OrganizePlanilha.UI.Web/bin/HLP.OrganizePlanilha.UI.Web.pdb
	HLP.OrganizePlanilha.UI.Web/HLP.OrganizePlanilha.UI.Web/obj/Debug/HLP.OrganizePlanilha.UI.Web.pdb
a