modified site_url
Merge branch 'master' into gh-pages

Conflicts:
	publishconf.py