discard change.
Merge branch 'master' of https://github.com/kingmacrobo/iOS