fix tolua_fix, cleanup peertable after object deleted
android & ios screen size change support
config android_mk_generator
replace os.path.samefile

os.path.samefile not work at windows.
add some options

Usage: android_mk_generator.py [options]

Options:
-h, --help            show this help message and exit
-c CONFIG, --config=CONFIG
config file path.
-r ROOTPATH, --rootpath=ROOTPATH
class root path for mkfile, pathes, exclude.
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
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
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