Globals
Merge branch 'refs/heads/dev' into gh-pages

Conflicts:
	_site/index.html
url pathsw