Adjusted screen modes for android devices when compiling with apportable.
fix type from displayFrame to spriteFrame
opacity now works as animatable property.
Updates Cocos2d
Updates the default project
Updates Cocos2d
Added device detection when compiling with Apportable
Updated cocos2d CCLabelTTF.m to correctly set a shader program for older version of ios (<6)
Merge branch 'develop' of https://github.com/apportable/SpriteBuilder into develop
Added a default configuration.json to the template project. With a default configuration.json, users can just run apportable load without havnig to adjust the config file manually.
Merge branch 'develop-apportable-configuration' of github.com:apportable/SpriteBuilder into develop

Conflicts:
	SpriteBuilder/libs/cocos2d-iphone