issue #3626:Add the “override “ keyword
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into test-rebase
Merge pull request #5117 from samuele3hu/test-rebase

close #3626:Add the “override “ keyword
Update CHANGELOG [ci skip]
fix namespace in spine lua manual binding
Merge pull request #5119 from edwardzhou/updateSpineLuaNamespaceManual

fix namespace in spine lua manual binding
Renderer: Don't sort z=0 Commands

If Command has z==0, then those elements won't be sorted.
Only Z !=0 will be sorted, and it will use `sort` instead of `stable_sort`
for z!=0, since it is faster
Merge pull request #5120 from ricardoquesada/renderer_no_sort_z_0

Renderer: Don't sort z=0 Commands
When android project build native, using multiple concurrent job processes;
android项目编译时,默认利用"-j"参数,启用跟cpu数相同的多进程编译
GlobalZOrder is used for render priority...

...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
GlobalZOrder is used for render priority...

...and not vertexZ

Node::setGlobalZOrder() is used to change that.

Node::setZOrder() -> Node::setLocalZOrder();
Merge branch 'global_z_order' of github.com:ricardoquesada/cocos2d-x into global_z_order

Conflicts:
	CHANGELOG
Merge pull request #5123 from ricardoquesada/global_z_order

GlobalZOrder is used for render priority...
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5124 from CocosRobot/updategeneratedsubmodule_1390074821

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5121 from liang8305/use_multiple_build_process

When android project build native, using multiple concurrent job process...
[ci skip]
close #3765:Simplify label.Remove FontAtlasFactory,FontDefinition and TextImage.
get number of cpu, using multiple concurrent job processes;
issue #2789: Adds Map, Dictionary perf test, not yet finished.