Implementing feature #39, added changes to deploy in openshift
Merge branch 'feature-39' into develop
Merge branch 'develop'