must commit first
merge conflict
Crash when attempting to click on removed close button. Oops
Merge conflict
Apparently Cocos2d does not flush texture cache automatically anymore