Merge pull request #1157 from dingpinglv/Iss2844_RenameVersion

Closed #2844: Rename version 2.1.6 of Cocos2d-html5 to 2.2
Issue #2901: fixed a bug of LabelTTF that it has wrong position when it was setting the style to stroke
temp
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
Closed #3061:
Fix a bug of LabelTTF that doesn't work on baidu browser.
Merge pull request #1209 from SmallAiTT/iss3061_bug4baidu

Closed #3061:
Fixed #2901: Fix bugs of LabelTTF that it has wrong contentsize and position when it was setting the style to stroke or shadow
add git ignore list
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss2901_FixLabelTTFBug

Conflicts:
	.gitignore
Fixed #2901: modify default value of shadow color string
Fixed #2901: Fix bugs of LabelTTF that it has wrong contentsize and position when it was setting the style to stroke or shadow
Merge pull request #1196 from dingpinglv/Iss2901_FixLabelTTFBug

Issue #2901: fixed a bug of LabelTTF that it has wrong position when it was setting the style to stroke
issue #2828 improve cc.UIWidget
issue #2828 add search path for CocoStudio
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 into develop
issue #2828 improve code for Armature
issue #2828 set cc.ENABLE_PHYSICS_CHIPMUNK_DETECT = true
issue #2828 change the order of addEventListener parameters.
fixed #3083: fixed a Scale9Sprite's bug that setCapInsets is invalid