Merge branch 'dev' into gh-pages

Conflicts:
	index.html