Carrierwave Gem
Uploader File
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader
Locations Views
Merge pull request #3 from TIYA-Durham-GDI/file_uploader

File uploader
Fix schema conflict