Merge branch 'develop' into fix_warnings

Conflicts:
	cocos/base/CCConsole.cpp
	cocos/base/CCConsole.h