contentScale/positionScale fixes for SpriteBuilder
Fixes for rulers.
Some cleanup.
Fixing rulers in the iPad preview.
Fix for the 0 scale bug.
Merge branch 'develop' into contentScale
Layer ccb file contentScale fix.
Name changes.
More ruler fixes.
Removing some useless logging.
Updates Cocos2d
Renames CCLayerColor to CCNodeColor and CCLayerGradient to CCNodeGradient
Updates user positioning controls
Updates Cocos2d
Updates naming of positioning types
Fixes compile issues in default project
Updates Cocos2d
Fixes a number of issues caused by the new content scaling. Fixes last issues mentioned in #2.
Removes lots of old unused JS stuff
Fixes warnings