删除前准备

删除
Merge remote-tracking branch 'origin/UILayer' into UILayer

Conflicts:
	Classes/AppDelegate.cpp