v 0.9.4

v 0.9.4
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	login.html
	qr.html
	register.html