Make CCTouchDispatcher compatible with windows phone 8 (IE10 Mobile)
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
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
Fixed #1643 rename getFileData of cc.FileUtils to getByteArrayFromFile
fixing issue when calling setEffectsVolume() before playEffect()
add setAdditionalTransform
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()
The function end() of AudioEngine should be a static function
fixed #1816 bug of getTileGIDAt in TileMap module
Merge pull request #810 from wedteam/EGLView+designResolutionSize

Fixed the touch pointer location when reset the designResolutionSize
Merge pull request #822 from ShengxiangChen/issue1816_getTileGIDAt

fixed #1816 bug of getTileGIDAt in TileMap module
The function end() of AudioEngine should be a static function
The function end() of AudioEngine should be a static function

The function end() of AudioEngine should be a static function
 The function end() of AudioEngine should be a static function
Merge remote-tracking branch 'csx/issue1829_end' into issue1829_end

Conflicts:
	CocosDenshion/SimpleAudioEngine.js