Minor cleanup and warnings.
Merge branch 'develop' of github:cocos2d/cocos2d-iphone into develop

Conflicts:
	cocos2d/CCSprite.m