commit merge enre os computadores
commit application context
Merge branch 'master' of https://github.com/erikscaranello/super_seguro

Conflicts:
	sou_seguro/WebContent/WEB-INF/applicationContext.xml