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

CocosBuilder 2.1 beta2 bone animation support, more stalbe js binding…

…, iphone5 ios6 support, CCTableView

Merge pull request cocos2d#1263 from dumganhar/gles20

Updated android template.

Merge pull request cocos2d#1074 from dumganhar/gles20

Updated proj.android/project.properties. target=android-10 --> 8