Update controller and views for heroku
Merge pull request #3 from Flamdoodle/admin

Admin
Merge pull request #4 from Flamdoodle/development

Development
Merge branch 'master' of https://github.com/Flamdoodle/before-move into admin