simplify DataReader
Merge branch 'master' into new_SeparateImportExport

Conflicts:
	test/test/test.suo
1
1
Merge branch 'new_SeparateImportExport' of https://github.com/jyinkailej/CSArmature into new_SeparateImportExport

Conflicts:
	.gitignore
	test/test/test.suo
delete unused file
combie data to  CSData.h and CSData.cpp
remove editor file
remove .suo
remove .suo
1
Merge branch 'master' into new_SeparateImportExport

Conflicts:
	CSArmature/utils/CSDataReaderHelper.cpp
	test/test/test/Classes/HelloWorldScene.cpp
fix data reader frameData->y *= m_fPositionReadScale;
Merge branch 'new_SupportDragonBones_2.0' into Branch_0f5ed97bec733214588810b611c662606c40b158

Conflicts:
	CSArmature/utils/CSDataReaderHelper.cpp
	test/test/test/Classes/HelloWorldScene.cpp
Merge branch 'Branch_0f5ed97bec733214588810b611c662606c40b158' into new_SeparateImportExport

Conflicts:
	CSArmature/utils/CSDataReaderHelper.cpp
add DataReader::clear
1.temporary upload
Merge branch 'new_updateRender' of https://github.com/jyinkailej/CSArmature into new_updateRender

Conflicts:
	.gitignore
armature render
optimize performance