commit some in master
Merge branch 'master' of github.com:hongtaozhy/iOS-J3Dps