Removed useless coco2D stuff
Committed merge