update heroku
fix #138 load google js in app.js instead
Merge branch 'master' into heroku