closed issue:5020:The game still oriented in landscape mode when update the describes of orientation to Portrait in 'MainPage.xaml'.
getter always must be a const method.
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
fix UIText's fontSize

if set fontsize before setting font family, fontsize was wrong
Merge pull request #14 from bofeng-song/v3

show uploading file in play scene
Merge branch 'v3' into refactorLayout

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj