Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/scripting/auto-generated
	samples/Javascript/Shared
	tools/bindings-generator
Fixed bugs
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Fixed bug of reader
Fixed bugs.
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos/scripting/auto-generated
	plugin
	samples/Javascript/Shared
	tools/bindings-generator
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Fixed bug of reader.
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Add clone method to LayoutParameter
Merge branch 'develop' into develop_nutty_modify_framework_fixedupdatebugs
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
Fixed bug of label
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone
Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone