misc updates
Merge branch 'master' of github.com:dhowe/RiTaJS

Conflicts:
	test/index.html
mergin changes