initial
lots
Merge branch 'master' into gh-pages

Conflicts:
	globals.js