Merge pull request #904 from thayerandrews/develop

CCEffects - API documentation
Revert "Removing NPOT checks since it’s required by GLES2 and has been universally supported by Macs since at least 2007."

This reverts commit 1bd2e1136b4526518099fdde95f9b5d4bf3e553d.

Conflicts:
	cocos2d/CCEffectRenderer.m
Update version number
Merge remote-tracking branch 'upstream/develop' into develop