Creating template
Merge branch 'master' of ssh://pohnpei-evilsushi.rhcloud.com/~/git/pohnpei

Conflicts:
	.gitignore
	pom.xml
	src/main/webapp/index.html