Merge pull request #1145 from dingpinglv/DevelopToMaster

Merge develop to master
Fixed a Scale9Sprite's bug
Merge pull request #1156 from dingpinglv/FixedScale9SpritesBug

Fixed a bug of cc.Scale9Sprite
Closed #2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2844_RenameVersion

Conflicts:
	cocos2d/sprite_nodes/CCSprite.js
Merge pull request #1159 from dingpinglv/Iss2844_RenameVersion

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