Merge branch 'master' of https://github.com/calblueprint/BPSF into fix-images

Merge master
Fix image showing if statement
Fix carrierwave error in image upload
Fix recipient association error when transferring draft to grant
Fix image transfer between draft and grant after submit
Merge pull request #244 from calblueprint/fix-images

Fix images