Merge branch 'devlop' into feature/leo2991
share打中文
Merge branch 'feature/leo2991' into devlop

Conflicts:
	miniGame/MaterialCell.xib
	miniGame/materialWithCollectionViewController.m