Creating template
Merge branch 'master' of https://github.com/lpenet/test-jelastic

Conflicts:
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Exploding wars.