Some changes have been added to the project, please refer to the author for more details.
Merge branch 'master' of https://github.com/wkerrand/Openshift-project

Conflicts:
	deploy.sh