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

Conflicts:
	bin/jarlist.cache

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

Conflicts:
	bin/classes/com/example/testcollision/MainActivity.class
	bin/classes/com/example/testcollision/ui/StageView.class

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