Merge branch 'master' of https://github.com/michaelanthonymain/tosche-station-web

going back to master before heroku stuff to work on JS
Merge branch 'master' of https://github.com/michaelanthonymain/tosche-station-web

Updating local master
Added paperclip and the S3 gem
Added migrations for having paperclip attachments in the Collections table
Made it so that when an image is sent to server, it saves to S3
Made it so the server no longer sends down 404 not found back to the phone
Added methods for Paperclip to save images
Now grabs images from S3
Added extra newlines per mobile team's wishes
Schema
Fixed spec
fixed this conflict.