fix: copy map when getParseCallBackMap() and getParseObjectMap()
add GUIReader::registerTypeAndCallBack for std::function
replace NULL to nullptr

fix compile error
merge extension EditBox to ui module
fix linux compile error
fix linux compile error
Merge branch 'v3' into customguireader
Merge branch 'v3' into mergeExtensionEditBox

Conflicts:
	cocos/ui/Android.mk
add Scale9Sprite to create method of ui::EditBox
remove Extension EditBox
Merge branch 'v3' into customguireader
Merge branch 'v3' into customguireader
fix indent
remove resources for unused.
modify for compress
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
Merge branch 'customguireader' of https://github.com/lite3/cocos2d-x into customguireader
Merge branch 'v3' into customguireader
Code Standards
Merge branch 'newcode' into v3

Conflicts:
	cocos/3d/CCBundle3D.cpp