dev 多次调用fast join会重新计算超时时间
Merge branch 'feature/sns_login_20140106' into feature/fast_join_hack_20140202
dev 增加等待取消功能，同时，客户端多次发送fast join 会中断之前等待游戏的过程，重新进入等待
Merge branch 'feature/fast_join_hack_20140202' of github.com:Tassemble/520wenxiong into feature/fast_join_hack_20140202