small chang
Merge branch 'master' of http://github.com/tongjiapp/iOS

message viewcontroller