refactor PhysicsContact inherits from EventCustom; simplify emitting collision events
fix compile error
remove the workaround cast
Merge branch 'physics_event' of https://github.com/edwardzhou/cocos2d-x into iss3716_refactor_physicscontact

Conflicts:
	cocos/physics/CCPhysicsContact.h
issue #3716: refactor physics contact
closed #3716: edit lua support
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3716_refactor_physicscontact
Added getPropertiesForGID that assings value instead of returning it.
Ignore files generated by cmake
issue #3781, use python script instead.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue#3781
not resource
Merge branch 'runtime' of https://github.com/chuanweizhang2013/cocos2d-x into runtime
Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268

Conflicts:
	tests/test-javascript/tests
issue #3781, use custom python executeable if PYTHON_BIN defined
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268
Merge pull request #5312 from dumganhar/merge5268

closed #3716:PhysicsContact should be inherited from EventCustom, it will simplify the logic of emitting collision events
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5317 from CocosRobot/updategeneratedsubmodule_1392014528

[AUTO] : updating submodule reference to latest autogenerated bindings
issue #3498: commit jsruntime