commit
Merge remote-tracking branch 'repo/master' into Adam
加uiactivityviewindicator 和代码