fixed # 2294 Migrate Action class to Cocos2d-x 2.1.4
Merge branch 'develop' of Cocos2d-html5 into Iss2294_MigrateActionClasses

Conflicts:
	cocos2d/CCLoader.js
fixed #2294 Migrate Action class to Cocos2d-x 2.1.4
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2294_MigrateActionClasses
Merge pull request #999 from dingpinglv/Iss2294_MigrateActionClasses

fixed # 2294 Migrate Action class to Cocos2d-x 2.1.4