Creating template
Merge commit '66a119a876906e04b222f0e63f0925df876d9359'

Conflicts:
	README.md
	pom.xml
	src/main/webapp/index.html