Updated pull request #7065 due to new changes in current branch
- Switched ProgramState from unordered_map<string, Uniform> to unordered_map<GLint, Uniform> for faster uniform search
- changed `uniformValue` variable name to more relative
fix margin zero
add deprecated variable
add MarginZero as an external variable
fix platform compile error
Merge pull request #7065 from Teivaz/v3

Custom uniform search optimization
[ci skip]
[AUTO]: updating luabinding automatically
Merge pull request #7231 from andyque/fixUIMargin

fix ui Margin
[AUTO][ci skip]: updating cocos2dx_files.json
[ci skip]
Merge pull request #7232 from CocosRobot/update_lua_bindings_1403857751

[AUTO]: updating luabinding automatically
Merge pull request #7233 from CocosRobot/update_cocosfiles_1403858314

[AUTO][ci skip]: updating cocos2dx_files.json
closed #5606, Merge branch 'v3' into refactor5606

Conflicts:
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libGUI.vcxproj.filters
	cocos/ui/proj.wp8/libGUI.vcxproj.filters