merge code.
Merge branch 'master' of github.com:wangyangkobe/ios_study