Fixed bug with cascade opacity for control button.
issue #5183, add CCLayoutExecutant file
issue #5183, refator LayoutExecutant
Fix Progress Action.
issue #5183, add LayoutProtocol
issue #5183, done
issue #5183, done
issue #5183, remove no needed type
Merge branch 'v3' into refactorLayout

Conflicts:
	cocos/ui/UILayout.cpp
issue #5183, add layout parameter type to widget for convenient access
show uploading file in play scene
fix potential problem
remove inner function from header file
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
fix build error
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst

Conflicts:
	cocos/ui/UIListView.h
	cocos/ui/UIPageView.h
fixed mac relaunch bug
fixed version num
Merge pull request #20 from chuanweizhang2013/v3luaruntime

fixed mac relaunch bug
Merge pull request #21 from cocos2d/v3

Merge pull request #6791 from cocoscodeide/v3