user.js upd
Merge branch 'master' of github.com:m1kc/uonline

Conflicts:
	utils/user.js