CCMenu.initWithArray : code alignment
cc.MenuItemImage.create argument reorder based on example
cc.MenuItemImage.create argument reorder based on example
Merge branch 'master' of git://github.com/cocos2d/cocos2d-html5
Merge branch 'master' of github.com:suhanlee/cocos2d-html5
preload audio resource
Merge remote-tracking branch 'cocos2d-html5/master' into issue1569_audioJSB
change transform
fixed progress for affine transform
r
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into masterTeam

Conflicts:
	cocos2d/sprite_nodes/CCSprite.js
	template/main.js
merge properly
Fix inconsistent base64 decoding across browsers breaking the particle textures
Improve particle system and image tinting performance by 3x
Merge branch 'master' of git://github.com/cocos2d/cocos2d-html5
Fixed jscomp build ERROR

Removed trailing comma
solved 2 bugs
added an return where one was missing and changed the name of two
constants which are different from those in the ccbi files which the
cocosbuilder generates. This bug generates in Firefox  popups.
added keyboard events to CCLayer
fix a ==
description update