update Xcode project
Merge branch 'Armature_bug#1' of https://github.com/chengstory/CSArmature into chengstory-Armature_bug#1

Conflicts:
	test/test/test/Classes/HelloWorldScene.cpp
	test/test/test/Classes/HelloWorldScene.h
update README.md
update README.md
add android project
modify gitignore
update android project
Merge branch 'master' into new_updateRender