issue #2404:Add more deprecated function and modify some test sample
Merge pull request #3298 from minggo/develop

make iOS template work ok on armv7s devices
issue #2430: Moving enum type to class for CCBReader.
issue #2404:Add more deprecated function
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
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.
issue #2404:Add more deprecated function and Modify template vs11 solution
issue #2430: CCBValue::Type is strong enum type now.
Merge branch 'DrawNode' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode
Merge branch 'iss2430-ccb-constants' of https://github.com/dumganhar/cocos2d-x into iss2430-ccb-constants
Untabify for CCBValue.cpp.
Merge pull request #3302 from dumganhar/iss2430-ccb-constants

issue #2430: CCBValue::Type is strong enum type now.
Merge pull request #3301 from samuele3hu/DrawNode

Add more deprecated function and modify template vs2012 soutions
set _isDownloading to false before return