emotion
Merge branch 'master' of https://github.com/bleujin/talkserver.git

Conflicts:
	src/net/ion/talk/handler/engine/UserConnectionHandler.java
	test/net/ion/framework/mail/TestMailer.java
	test/net/ion/talk/TestAllCrakenServer.java
	test/net/ion/talk/account/TestAccount.java
	test/net/ion/talk/bot/TestEchoBot.java
	test/net/ion/talk/deploy/TestToonServerNew.java
	test/net/ion/talk/handler/engine/TestUserConnectionHandler.java
	test/net/ion/talk/let/TestEmbedBotLet.java