2014.6.29 3:14
bug修复
Merge remote-tracking branch 'origin/master'