working now for mozilla
Merge branches 'master' and 'dev'
Merge branches 'heroku' and 'master' into heroku