update
Merge branch 'master' of https://github.com/spllot/chatroom

Conflicts:
	admin/views/default/user/index.html