修复bug
Merge branch 'master' of https://github.com/momoplan/moyouejabberd.git

Conflicts:
	moyouejabberd/src/aa_hookhandler_sup.erl
	moyouejabberd/src/my_msg_center.erl