bot

bot
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/stone/scalaer/bot/handler/Handlers.scala