Creating template
GCM Server test online
Syncing openshift and github repos
changing openshift's wildfly database jndi name
Merge branch 'master' of https://github.com/ramielsawy/SOSApp.org
Merge branch 'master' of ssh://sosapp-relsawy.rhcloud.com/~/git/sosapp

Conflicts:
	README.md
removed openshift files from root