Merge pull request cocos2d#299 from xingsenma/master

issue #3419 fix bug for TriggerTest.

Merge pull request cocos2d#224 from dingpinglv/Iss2844_RenameVersion

Closed #2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2

Merge pull request cocos2d#217 from Dhilan007/master

Add game demo FruitAttack

Merge pull request cocos2d#197 from dumganhar/android-filelookup

Adding crystals.pvr.ccz --> crystals.pvr Published-Android/fileLookup.plist, TODO: CocosBuilder should publish fileLookup.plist correctly for android.

Merge pull request cocos2d#175 from dingpinglv/Iss2269_FixBugForLabel…

…Test

fixed #2269 add a condition to LabelTest for LabelTTFStrokeShadowTest

Merge pull request cocos2d#157 from dingpinglv/Iss2082_FixSomeBugs

fixed #2082 remove ActionOrbit from arrayOfActionsTest when renderer is  Canvas

Merge pull request cocos2d#116 from dingpinglv/Iss1643_FileUtilsTest

Fixed #1643 modify MenuTest for register touches event

update build.xml file