Issue #2901: fixed a bug of LabelTTF that it has wrong position when it was setting the style to stroke
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
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into dirty_develop