teste hailto merge
Merge branch 'master' of https://github.com/rasalarig/ordem-servico.git

Conflicts:
	src/br/com/iniciativa21/ordemservico/controller/UsuarioController.java
Merge branch 'master' of https://github.com/rasalarig/ordem-servico.git