Adding travis-ci build for emscripten port.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2863 from dumganhar/master

Adding travis-ci build for emscripten port.
Merge pull request #2864 from minggo/master

make create-android-project.sh work ok
Merge pull request #2865 from minggo/master

add description of path that custom font can put in
Merge pull request #2866 from minggo/master

update changelog
[travis-ci] Speed up android build.
Merge pull request #2870 from dumganhar/master

[travis-ci] Speed up android build. [master]
merge pull reqeust fixing for iOS7 and Xcode5 into master
LabelTTF vertical alignment fixed on OS X

vertical alignment was broken on OS X.
top and bottom were switched.
Template fix for iOS Template.
Fix a bug (https://github.com/cocos2d/cocos2d-x/pull/2902)
android target 17 --> 8.
[Windows] multi-platform-lua fix.
Merge pull request #2903 from dumganhar/master

Template fixes for iOS and Windows
[2.1.5] Fixing black screen on android. Refer to https://github.com/cocos2d/cocos2d-x/pull/3117 .
[2.1.5] Fixing a typo: EVNET_ --> EVENT_
[2.1.5] Adding listener for CCDrawNode when application resume from background. Observer was set only when CC_ENABLE_CACHE_TEXTURE_DATA was enabled in CCParticleSystemQual.cpp.
[2.1.5] Resetting VAO in ccGLInvalidateStateCache.
[2.1.5] Observer is added only when CC_ENABLE_CACHE_TEXTURE_DATA is enabled in CCTextureAtlas.cpp.