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

Conflicts:
	package.json
add openshift mongodb password