updated admin forms
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4
heroku prep
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4