* enter private chat
Merge branch 'master' of https://github.com/ranacseruet/ultra

Conflicts:
	js/ultra.js