Fixed bug #802. Changed opacity value from unsigned char to float.
Merge pull request #886 from chadwyk/v3.1

Fixed bug #802. Changed opacity value from unsigned char to float.
Fix for .psd extensions in CCSpriteFrameCache. Added fileLookup.plist lookup.
Indentation cleanup.
Inlining some method calls in [CCSprite draw] that were showing up heavily in the profiler.
Adding a scale variable to the sprite performance tests to reduce fillrate usage.
Merge branch 'v3.1' of https://github.com/sidebolt/cocos2d-iphone into v3.1
Removing NPOT checks since it’s required by GLES2 and has been universally supported by Macs since at least 2007.
Cleaning up inconsistent #if DEBUG usage.
Adding class guards to +initialize methods.
Don’t count the stat label’s batch toward the total.
Merge branch 'v3.1' into develop

Conflicts:
	cocos2d/CCEffectRenderer.m
Merge branch 'develop' of github.com:cocos2d/cocos2d-iphone into develop

Conflicts:
	cocos2d/CCDirector.m
Merge remote-tracking branch 'upstream/develop' into develop