change baseurl settings
Merge branch 'master' into gh-pages

 - Change baseurl property