Merge branch 'master' of https://github.com/hisrael/shiny-octo-avenger

Conflicts:
	teste/.classpath
	teste/pom.xml
	teste/src/main/webapp/WEB-INF/web.xml
teste