Added retina/pad/phone device detection logic when compiling with Apportable
Ensured that a shader program is set when trying to update cclabelttf texture on older version of ios (<6). Note: this is required for apportable.
Merge branch 'develop-v3' of https://github.com/apportable/cocos2d-iphone into develop-v3
Transition renaming for clarity
Merge pull request #494 from cocojoe/develop-v3

Documentation Tweaks, Retired BridgeSupport, Issue Fix
Fixed start and resume for scenes during transitions
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3
During transitions, scenes are now paused and resumed correctly, according to pause and transition animated, setting
Minor template menu changes
OSX Template fixes
Merge pull request #497 from nickskull/develop-v3

OSX Template fixes
Restructured cocos2d-ios project so that it plays nicely with apportable build system (projects can only have 1 target)
Fix and tests for CCNode.paused.
Merge branch 'develop-v3' of github:cocos2d/cocos2d-iphone into develop-v3
Fixes #486
Merge branch 'develop-v3' of https://github.com/cocos2d/cocos2d-iphone into develop-v3

Conflicts:
	cocos2d-ui/CCButton.m
improve asserts.
Project fixes for Apportable compatibility
Merge branch 'develop-v3' of https://github.com/apportable/cocos2d-iphone into develop-v3
OSX warnings
Template test removal