issue #2430: Moving enum type to class for CCBReader.
Merge pull request #3299 from samuele3hu/DrawNode

issue #2404:Add more deprecated function and modify some test sample
member variables renaming according cocos2d-x style.
Reverting LuaCocos2d.cpp.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-ccb-constants
Adding deprecated constants for CCBReader.
issue #2430: [Win32] Undefine the macro RELATIVE since it was conflicted with CCBReader::SizeType::RELATIVE and CCBReader::ScaleType::RELATIVE.
Merge pull request #3300 from dumganhar/iss2430-ccb-constants

issue #2430: Moving enum type to class for CCBReader.
Merge branch 'DrawNode' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode