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

Conflicts:
	script/room.script
	src/net/ion/talk/ToonServer.java
	src/net/ion/talk/bot/EmbedBot.java