fix displayindex change
Merge branch 'master' of https://github.com/jyinkailej/CSArmature

Conflicts:
	test/test/test.suo
gitignore
Merge branch 'master' into new_SeparateImportExport

Conflicts:
	test/test/test.suo