many changes
Merge branch 'master' of github.com:xingrz/swiftz-android