some unmerged changes
Merge branch 'master' of https://github.com/lerayne/tinng-client-web

Conflicts:
	scripts/main.js