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

Conflicts:
	cocos/gui/UIHelper.h
temp commit
Modify mk files
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
Test commit
continue replacing `const char*` with `const std::string&`

This patch includes:

* Continue replacing `const char*` with `const std::string&`  where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
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
Reslove the linux compiled error
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck
Reslove the compiled error
Merge pull request #4122 from samuele3hu/developCheck

[ci skip]Reslove the linux compiled error
[AUTO] : updating submodule reference to latest autogenerated bindings
fix compiling erros on Android
Merge pull request #4124 from CocosRobot/updategeneratedsubmodule_1383815479

[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4125 from minggo/fix-compiling-error

[ci skip]fix compiling erros on Android