Signed-off-by: cst <cst8588092@yahoo.com.cn>
Merge branch 'master' of https://github.com/MonsterStorm/AndroidCollision

Conflicts:
	bin/TestCollision.apk
	bin/classes.dex
	bin/classes/com/example/testcollision/MainActivity.class
	bin/classes/com/example/testcollision/StageView.class
	bin/dexedLibs/android-support-v4-99bce0ac27a276c4ce0daf186daad444.jar
	bin/dexedLibs/stormdroid-d2391a0176dfef3861c8b324a4a2e6ed.jar
	bin/res/crunch/drawable-hdpi/necklace1.png
	bin/res/crunch/drawable-hdpi/necklace2.png
	bin/res/crunch/drawable-hdpi/necklace3.png
	bin/res/crunch/drawable-hdpi/necklace4.png
	bin/res/crunch/drawable-hdpi/necklace5.png
	bin/resources.ap_

Signed-off-by: cst <cst8588092@yahoo.com.cn>
Signed-off-by: cst <cst8588092@yahoo.com.cn>