Some commit message
Merge https://github.com/sasankloka/ganosite

Conflicts:
	.openshift/action_hooks/pre_build
	pom.xml