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

Conflicts:
	bot/ionmail.script
	bot/simsimi.script
	src/net/ion/talk/handler/craken/UserInAndOutRoomHandler.java