merge develop into master and deploy to Heroku