Merge branch 'devlop' into feature/keeliker
debug中 collection
剩研究collecion複選
Merge branch 'feature/keeliker' into devlop

Conflicts:
	miniGame.xcodeproj/project.pbxproj
	miniGame/AppDelegate.m