冯岩合并前准备
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/AppDelegate.cpp