Creating template
pushing from intellij
Merge remote-tracking branch 'openshift/master'

Conflicts:
	.openshift/cron/weekly/chronograph
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml
Merge remote-tracking branch 'openshift/master'

Conflicts:
	.openshift/cron/weekly/chronograph
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml