issue #2430:use upper letters for enum item in AssetsManager and WebSocket
issue #2430:use upper letters for enum item in Image
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
issue 2430:use enum class
issue 2430:use enum class for Control enum values
fix warnings
issue 2430:fix a compiling error and add missing cpp
issue #2430:fix some compiling error
issue #2430:move EditBox enum into class
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum
issue #2430:fix some errors
Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum

Conflicts:
	scripting/javascript/bindings/generated
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType
issue #2430: Fixing compilation  errors for lua and js bindings.
More enum class: ScrollView::Direction, TableView::VerticalFillOrder
issue #2430: Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp
Merge pull request #3280 from dumganhar/minggo-iss2430-modify_enum

Merge PR https://github.com/cocos2d/cocos2d-x/pull/3270, move enum into class and using enum class