Add app icon & change app display name
Merge branch 'master' of https://github.com/zCloud1984/ABiteOfKunMing into develop

* 'master' of https://github.com/zCloud1984/ABiteOfKunMing:
  change collection view size
aa
Merge branch 'master' into develop

* master:
  fix test

Conflicts:
	ZYreloginViewController.m
修改界面配色
Merge branch 'develop'

* develop:
  修改界面配色
  aa
  Add app icon & change app display name

Conflicts:
	ABiteOfKunMing.xcworkspace/xcshareddata/ABiteOfKunMing.xccheckout
	ABiteOfKunMing/Base.lproj/Main.storyboard
	ABiteOfKunMing/Images.xcassets/AppIcon.appiconset/Contents.json