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

Conflicts:
	package.json
another start script
openshift network settings