Merge pull request #2216 from dumganhar/master

Fixing compilation errors for linux.
fix a logic error and a memory leak in CCLabelBMFont.
Merge pull request #2218 from dumganhar/bmfont-logic-error

fix a logic error and a memory leak in CCLabelBMFont. This PR could fix wrong display of Score in WatermelonWithMe.
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x