A few fixes
Merge branch 'master' of https://github.com/levios/javach

Conflicts:
	viz/index.html