Fix the base url.
Merge branch 'develop'

* develop:
  Fix the base url.
Merge branch 'master' into gh-pages

* master:
  Fix the base url.