Merge branch 'development'
Update admin controllers to permit attributes
Merge branch 'activeadmin'
Uploader File
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader