Creating template
Merge commit '763df7b5ddc33b54e8df593322564bf39abf980e'

Conflicts:
	pom.xml
Added comments for dual use .war on Tomcat vs. .jar with build in Tomcat
Added OpenShift profile to .pom