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
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
 The function end() of AudioEngine should be a static function
Merge pull request #821 from ShengxiangChen/issue1829_end

The function end() of AudioEngine should be a static function
Issue #1759 update CCBReader to last version
issue #1840: fixed touch improvement bug.
Merge pull request #824 from linshun/iss1840_v2.1.2

issue #1840: fixed touch improvement bug.
Updates to version 5 of CCB Reader
Merge pull request #828 from ricardoquesada/ccb_version_5

Updates to version 5 of CCB Reader