Merge pull request cocos2d#3848 from 2youyouo2/master

update armature

Merge pull request cocos2d#3732 from dumganhar/develop

[Win32] Updating the window size of JS-Games to 480x720.

Merge pull request cocos2d#3224 from azmeuk/emscripten

emscripten keyboard support

Merge pull request cocos2d#2903 from dumganhar/master

Template fixes for iOS and Windows

Merge pull request cocos2d#2489 from minggo/master

update version and changelog

Merge pull request cocos2d#2234 from dumganhar/memory-leak

Fixing memoryleaks.

Merge pull request cocos2d#1723 from dumganhar/gles20

[Marmalade fix] Added development.icf for HelloCpp. Added Marker Felt.ttf for SampleGame.

Update CHANGELOG