addd method changeDisplayByName
Merge branch 'changeDisplayByName'

Conflicts:
	extensions/CocoStudio/Armature/datas/CCDatas.h
	extensions/CocoStudio/Armature/display/CCDisplayFactory.cpp
	extensions/CocoStudio/Armature/utils/CCDataReaderHelper.cpp