update api key and default location
Merge branch 'master' into gh-pages

* master:
  update api key and default location