Creating template
Merge remote-tracking branch 'openshift/master'

This is an attempt to merge a repository from github as cloned as origin with a repository from openshift.
fixed database connection parameters
fixed database config conditional logic
added hot_deploy setting