commit
commit
Merge branch 'master' of https://github.com/v-rajan/fabric8-openshift-cartridge.git

Conflicts:
	metadata/manifest.yml