fixes tmx maps
Merge pull request #6538 from ricardoquesada/tmx_fixed

fixes tmx maps
linux cmake improvements

Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
Merge pull request #6539 from ricardoquesada/cmake_improvements

linux cmake improvements
Moves cocos/2d/Android.mk to  cocos/Android.mk

Easier to find Android.mk
Merge pull request #6541 from ricardoquesada/android_mk_fixes

Moves cocos/2d/Android.mk to  cocos/Android.mk
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6542 from CocosRobot/update_cocosfiles_1398978892

[AUTO][ci skip]: updating cocos2dx_files.json
Lua and C++ compiles for linux
Merge pull request #6543 from ricardoquesada/template_fixes

Lua and C++ compiles for linux
updates changelog
Merge pull request #6544 from ricardoquesada/changelog

updates changelog
rolling back physics in layer
rolling back tests
Merge pull request #6545 from ricardoquesada/physics_rollback

Physics rollback
Updated changelog
Merge pull request #6547 from ricardoquesada/changelog

Updated changelog
[AUTO]: updating luabinding automatically
Merge pull request #6548 from CocosRobot/update_lua_bindings_1398990974

[AUTO]: updating luabinding automatically
Lua compiles again