Merge branch 'js-test'

Conflicts:
	index.html