Merge master branch to develop branch
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch

Conflicts:
	cocos/gui/UIHelper.h
temp commit
Modify mk files
[AUTO] : updating submodule reference to latest autogenerated bindings
[ci skip]
[ci skip]
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
Test commit
Merge pull request #4114 from CocosRobot/updategeneratedsubmodule_1383730712

[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3113: [Linux] Adding options for modules.
Merge pull request #4116 from dumganhar/cmake-option

issue #3113: [Linux] Adding options for modules.
correct type in root CMakeLists.txt
Merge pull request #4118 from ol-loginov/correct_root_cmake

correct typo in root CMakeLists.txt
fixed linux build error
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
remove unneeded files
Merge pull request #4121 from minggo/develop

remove unneeded files
Merge pull request #4113 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch

Merge 2.x version to 3.0 version
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop