remove unneeded includes
remove unneeded includes
remove unneeded includes
fix conflict
revert lua-bindings
fix compiling error on windows
fix conflict
make debug writable path the same as release
Merge pull request #7905 from minggo/optimize-compiling

remove unneeded includes
[AUTO]: updating luabinding automatically
Merge pull request #7914 from CocosRobot/update_lua_bindings_1409308555

[AUTO]: updating luabinding automatically
Adds MARK: TODO: FIXME: in code

Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme

Adds MARK: TODO: FIXME: in code
fix chipmunk
Merge pull request #7913 from chuanweizhang2013/v3fixed

make debug writable path the same as release
Merge pull request #7916 from andyque/fixChipumnk

remove chipmunk.h include in header file
Merge pull request #31 from cocos2d/v3

update v3
Merge pull request #67 from chuanweizhang2013/v3luaruntime

update v3