Merge branch 'develop'
Modified Gemfile to support Heroku deployment
Merge branch 'master' into develop