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

Conflicts:
	README.md
	pom.xml
	src/main/webapp/WEB-INF/web.xml
adding openshift to the project