HOTFIX commented out sprockets
Merge branch 'development'
HOTFIX made some changes to application controller
HOTFIX made some changes to angular controller
HOTFIX made some changes to angular controller
HOTFIX made some changes to angular controller
HOTFIX made some changes to angular controller
merging with master
potential fix for dependency injection heroku minification weirdness
potential fix for dependency injection heroku minification weirdness take 2
potential fix for dependency injection heroku minification weirdness take 3
potential fix for dependency injection heroku minification weirdness take 4
potential fix for dependency injection heroku minification weirdness take 5
potential fix for dependency injection heroku minification weirdness take 6
potential fix for dependency injection heroku minification weirdness take 7
Merge branch 'development'
all bookmarks now working