Merge branch 'master' into gh-pages
changed theme, base_path
Merge branch 'gh-pages'