Creating template
ajustes
Merge origin/master

Conflicts:
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Merge origin/master

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