change site_url var in config
Merge branch 'master' into gh-pages

merge