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
Fixing compile errors in Xcode 4.6
Adding iphone5 version of default.png. Validated projects. Projects still work under 4.4 and compile, run on armv6. 
Fixes for mac compatibility and to get rid of warnings. Both iOS and mac compile without warnings in  cocos parts (debug and release). Only one warning left, complaining about a xib. 

NSInteger is 64 bit on mac, using __LP64__ flag to differentiate (mostly for logs)
a few fixes for compile error/warning. 
Update all mac projects
Warning is incorrect, printed type is now good. SInt32 is signed long in 32 and 64 bit. 
Test case for different handling of view controller orientation changes between iOS6 and iOS5. Test demonstrates identical behaviour in both cases. 
Fixed crash when removing touch item in callback. See topic http://www.cocos2d-iphone.org/forum/topic/12250 for more information. I've applied Riq's patch. 

Also added test case. 
whitespace fix iOS + mac
Setting window rootViewController where possible
Only resize EAGLView when necessary (re re re fix of issue #1153). 

Did this because when using a scroll view added as subview to the EAGLView each movement (touches moved) triggered a resizing of the EAGLView. 
Called wrong method. Updated change log
Update box2d and chipmunk
Updating templates with iOS6 support. 
Fixes for physics templates iOS

-CCDrawNode, CCPhysicsNode, CCPhysicsSprite from 2.x rewritten for 1.1.