201408021737继续修复用户跳转逻辑 加入部分注解
Merge remote-tracking branch 'origin/timor' into hcjcch