remove deprecation warning during heroku deploy
Merge branch 'master' of https://github.com/brianwisti/marysplace-rails