issue #2103 modify AudioEngine framework and CocosDenshionTest sample
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-master
Changing namespace Json to CSJson to avoid conflicts.
fixed #2270: Adding Armature(CocoStudio runtime) support.  Enabling exceptions for marmalade.
Merge pull request #2834 from samuele3hu/test_sample_of_http_bind

fixed #2103: modify AudioEngine framework and CocosDenshionTest lua sample.
fixed #2270: Adding licenses of jsoncpp and sigslot.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge pull request #2835 from dumganhar/2youyouo2-master

fixed #2270: Adding Armature(CocoStudio runtime) support.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Fix collider detection