heroku rails4 compatibility
Merge branch 'enhancements'
rails 4 image-url compatibility
Merge branch 'enhancements'