Creating template
add source
Merge branch 'master' of ssh://back-onlinerreader.rhcloud.com/~/git/back

Conflicts:
	.openshift/config/server.xml
	.openshift/config/settings.prod.xml
	.openshift/config/settings.rhcloud.xml
	.openshift/config/settings.stg.xml
	.openshift/cron/weekly/chronograph
	pom.xml
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.html