init
Merge branch 'master' of github.com:jczuchnowski/openshift-spray-mongodb-template

Conflicts:
	.gitignore