Merge branch 'master' of https://github.com/relatoconsultoria/examples

Conflicts:
	example1/src/main/webapp/index.jsp