Manage time through hours table, and fix image url errors
Merge branch 'master' into openshift
Change app_config.yml to read openshift env