增加了aim_user
解决了预约名字的问题
fix bug
Merge branch 'master' into wxttt