correções
Merge branch 'master' of https://github.com/LuisHenriqueCampos/PI_5_Uaps

Conflicts:
	ProjetiIntegrador5/ProjetiIntegrador5-war/nbproject/private/private.xml