Fixed bug of gui reader
fixed drawDebugData of LabelBMFont/LabelAtlas.
Merge pull request #6355 from nutty898/develop_nutty_fixedbugofguireader

Fixed bug of gui reader
Merge pull request #6356 from Dhilan007/develop_v3

fixed drawDebugData of LabelBMFont/LabelAtlas.
Merge branch 'develop' into develop_migrate_math_lib_merge

Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
fix compile warning after merge
Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib