[Template] Updating iOS template project of multi-platform-lua. Using AudioEngine module.
[Template] Updating multi-platform-lua/proj.marmalade/HelloLua.mkb.
[Marmalade] Updating scripting/lua/proj.marmalde/lua.mkf.
[Mac] Updating multi-platform-cpp/proj.mac/HelloCpp.xcodeproj.
Merge pull request #2855 from dumganhar/master

[Template] Updating multi-platform template.
[emscripten] Updating extension makefile.
Merge pull request #2861 from dumganhar/master

[emscripten] Updating extension makefile.
Fixing a logic error in CCDirector.cpp.
Fixing a bug that vs express can't work. Reported at https://github.com/cocos2d/cocos2d-x/issues/2859
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2862 from dumganhar/master

Fixing a bug that vs express can't work.
Adding travis-ci build for emscripten port.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
define and export LCC_ENABLE_CHIPMUNK_INTEGRATION for extensions anroid project
Merge pull request #2863 from dumganhar/master

Adding travis-ci build for emscripten port.
copy lua script when creating a project by create-android-project.sh
Merge pull request #2864 from minggo/master

make create-android-project.sh work ok
fixed #2259:add description of path that custom font can put in
Merge pull request #2865 from minggo/master

add description of path that custom font can put in
update changelog [ti ignore]