Merge branch 'V2.1Beta' of https://github.com/linshun/cocos2d-html5
Merge https://github.com/cocos2d/cocos2d-html5
Merge https://github.com/cocos2d/cocos2d-html5
Merge https://github.com/cocos2d/cocos2d-html5
CCMenu.initWithArray : code alignment
cc.MenuItemImage.create argument reorder based on example
Merge https://github.com/cocos2d/cocos2d-html5
issue #1615 fix build.xml
cc.MenuItemImage.create argument reorder based on example
Merge branch 'master' of git://github.com/cocos2d/cocos2d-html5
issue #1615 add kazmath and shader folder to cocos2d-html5
Merge branch 'master' of github.com:suhanlee/cocos2d-html5
Fixed issue where TMX maps only read in the first property for each tile GID. Added loop for all tile properties in CCTMXXMLParser.js
fix for Cocos2D TMX tile map tiles with multiple properties
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cocos2d/tileMap_parallax_nodes/CCTMXXMLParser.js
fixed formatting
Issue #1615: port CCConfiguration.js and port some class for WEBGL
Fixed #1624 support all input for TextInputTest
merge Submodule for samples
preload audio resource