made master and dev equivalent
Merge branches 'heroku' and 'master' into heroku