Merge branch 'dev'
migrates project layout to OpenShift convention
Merge remote-tracking branch 'openshift/master' into dev
fixes typo in settings
adds migration task to deployment hook