1. script commit
Merge branch 'master' of https://github.com/bleujin/talkserver

Conflicts:
	script/rooms/readNotifyData.script
	script/rooms/sendMessage.script
	script/users/friends.script
	script/users/info.script
	script/users/register.script
	script/users/search.script