meh
Merge branch 'master' into gh-pages

Conflicts:
	LoginSite/login.html
meh
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages