1
aa
Merge branch 'master' of https://github.com/mtrhgroup/xhjr

Conflicts:

XinHuaDailyXib.xcodeproj/project.xcworkspace/xcshareddata/XinHuaDailyXib
.xccheckout