resolve conflict
adding a simple spec that makes sure the inbox controller calls the photo
adding fixtures and test for uploading a photo via email
custom implementation of the decorator
adding the inbox controller for receiving emails and routes
adding the upload logic
Merge branch 'feature/incoming_photo_via_email' into develop
merge
Merge branch 'release/0.3'