issue #3037:Add assetsmananger lua binding and a releated test sample
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
issue #2771: implement contact callbacks
include climits for UINT_MAX
Merge branch 'fix_inclusion_phys'
issue #2771: fix some retain/release bugs
issue #2771: edit physics effect with all bodies and fix some bugs
issue #2771: add physics pump demo and fix bugs
issue #2771: edit listener
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager

Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
issue #2771: fix vs compile errors
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
issue #3037:Add assetsmananger lua binding and a releated test sample
issue #3037:Modify platform build config
issue #2771: enhance Listener use EventListener mechanism
issue #2771: fix some code style
issue #2771: fix some code style