Separate retina/content scale dependency
Merge branch 'develop-v3' into projection-scale
Mac content scale fixes from last week.
GL coordinate conversion for Mac
Mac contentScale fixes for TTF labels
Adding assertion to catch bad contentScale values
CCTexture.contentScale based on filename suffixes
Included folders in path
Files excluded from apple-docs
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
CCLayer renaming
Additional CCLayer renaming
Misc documentation fixes
positionScaleFactor -> UIScaleFactor
Removing some logging statementns
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into HEAD

Conflicts:
	cocos2d/CCTexture.h
	cocos2d/Platforms/iOS/CCDirectorIOS.h
Adds CCNodeColor to the mac project
Fixing some compilation issues with the tests.
Renames positioning types and adds missing documentation
Enabling retina mode.