fix-sitebaseurl
fix-site-baseurl-for-layouts
Merge pull request #1 from brickgao/master

pull from master