Merge pull request #1 from cocos2d/develop

Merging updates from base.
Fixed #1689: fixed the isTween bug of DragonBones-xml-data
Merge pull request #1699 from dingpinglv/Iss1689_isTween

Fixed #1689: fixed the isTween bug of DragonBones-xml-data
Merge pull request #1701 from wuzhiming/develop

fix the fileutils search path bug
Fixed a bug of Sprite that it doesn't work when its texture doesn't preload and its parent is a SpriteBatchNode
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into Iss1689_isTween
Merge pull request #1703 from dingpinglv/Iss1689_isTween

Fixed a bug of Sprite that it doesn't work when its texture doesn't preload and its parent is a SpriteBatchNode
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-html5 into develop
Multiline fixes on LabelBMFont: calculation for line break, empty lines handling, and first letter "swallowing".
Merge pull request #1714 from bassarisse/develop

cc.LabelBMFont issues
fix the fileutils search path bug