Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop' into HEAD
Merge remote-tracking branch 'origin/develop' into HEAD
Merge remote-tracking branch 'upstream/master' into develop-v2
Merge remote-tracking branch 'upstream/develop-v2' into develop-v2
(x): fix for CCRenderTexture issue with begin and end block not restoring the view correctly.
(x): fixed issue in retina mode and cleaned up the code.
(x). fixed ownership issue if the code is moved to ARC.
(x): restored CCRenderTexture's begin to its original intended functionality: ModelView matrix being the identity matrix.
(x): fixed issues with iPhone retina when using 3D projection.

It fixes issues with the RenderTexture and the Transitions tests as
well as keeps the fixes thought for the SpriteTest.
(x): fixed workspace not including the osx and javascript xcode projects.
(x): fixed issue with auto scaling mode (CCDirectorMac).
When a multiline label updates it counts multiple newlines as one and the string gets trimmed at the end.
This fixes that, keeping track of how many newlines where just skipped and appending as many characters that was skipped.
Revert "When a multiline label updates it counts multiple newlines as one and the string gets trimmed at the end."

This reverts commit 5f54b9c191240c5d0d8c0438173a55f2b626fb9b.
When a multiline label updates it counts multiple newlines as one and the string gets trimmed at the end.
This fixes that, keeping track of how many newlines where just skipped and appending as many characters that was skipped.
(x): fixed comment.
(x): fixed compilation issue of SpriteTest on MacOS X and moved SimpleSprite header and source files.
Adding support for rotations on iOS 6. We need access to will rotate not just should