Commit para colocar no HEAD
teste
teste
Commit para colocar no HEAD
Merge commit '6e5f76c425e0cb781af91d1ea4d883ace3eb7e80'
outro teste
teste merge
teste merge hailton 2
Merge branch 'master' of https://github.com/rasalarig/ordem-servico.git

Conflicts:
	src/br/com/iniciativa21/ordemservico/interceptor/AutorizadorInterceptor.java