Collision Implemented
Merge branch 'master' of github.com:LuizFernandoCirigliano/TwoAndAHalfGame

Conflicts:
	testCocos/Classes/testCocosScene.m