合體～～～～～
finish

finish
Merge branch 'democamel' into demo

Conflicts:
	miniGame/materialWithCollectionViewController.m