Make CCTouchDispatcher compatible with windows phone 8 (IE10 Mobile)
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
cc.UserDefault is with little change usable in JSB
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
fixed the touch pointer location when reset the designResolutionSize
fixed the touch pointer location when reset the designResolutionSize
Fix issue #1441 from cocos2d-iphone in cocos2d-html5

prevents "bouncing" effect when doing the catmullrom action
Merge pull request #808 from many20/UserDefault_work_in_JSB

cc.UserDefault usable from JSB
Merge pull request #812 from ricardoquesada/catmullrom_interpolation_fix

Fix issue #1441 from cocos2d-iphone in cocos2d-html5
designed resolution for mobile browser
Merge pull request #814 from ShengxiangChen/issue1695_AddDesignedSolutionForMultiResolutions

designed resolution for mobile browser
Keys in cc.RESOURCE_TYPE should match types used in switches, otherwise it won't work with advanced compilation level
Fixed #1643 rename getFileData of cc.FileUtils to getByteArrayFromFile
fixing issue when calling setEffectsVolume() before playEffect()
add setAdditionalTransform
Issue #1833 Reimplement cc.EditBox
Merge pull request #818 from dingpinglv/Iss1643_CCFileUtils

Fixed #1643 rename getFileData of cc.FileUtils to getByteArrayFromFile
Merge pull request #820 from xingsenma/FileUtils

add setAdditionalTransform
Merge pull request #816 from moadib/master

Fixed CCLoader code to make it work with advanced compilation level
Merge pull request #819 from jsambuo/fix-set-effects-volume-issue

fixing issue when calling setEffectsVolume() before playEffect()