Merge branch 'hotfix/time_start_end_conflict'
Merge branch 'release/some_bugfixes'
lowercased json require statement to fix heroku bug
deleted angular.js gzipped file to fix heroku precompile error
Revert "deleted angular.js gzipped file to fix heroku precompile error"

This reverts commit a2e9a62aa699e81d212ed07d856766b46eb81dc1.
hopefully fixes stupid heroku precompile trash
..................
Merge branch 'hotfix/heroku_json_fix' into develop