issue #2771: finish OneWayPlatform demo and fix some bugs
issue #2771: delay load
issue #2771: enhance API and add Slice demo
issue #2771: change some coding style
added | operator for Control::EventType
issue #2771: fix physics test compile error
issue #2771: move header definition to first line
issue #2771: make api more friendly
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
add Sprite::setScale(float, float)
correct type in root CMakeLists.txt
ignore output files from script make-all-linux-project.sh
Merge pull request #4118 from ol-loginov/correct_root_cmake

correct typo in root CMakeLists.txt
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