issue #2129:use capital words for static const member variables
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2129-remove_prefix
Merge pull request #3098 from minggo/iss2129-remove_prefix

use capital words for static const member variables
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp