Remove Carrierwave gem
Merge branch 'master' into comment_photos

Bringing comment_photos to latest version of master
Merge branch 'master' into comment_photos
Bringing branch up to date
Add picture to update form