Development - Merge latest development branch

Issue #17 - Updates for including deployment to Openshift production - test server.