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
fixed sprite, revert unnecessary changes
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5
revert unnecessary files
Merge pull request #769 from Wu-Hao/affineTransform

issue #1704: Affine transform