Merge pull request #872 from thayerandrews/develop

This fixes a build breakage that I introduced with my accidental push earlier.
CCEffects - Make designated initializers consistent

Instead of the parameterless initializer being designated and the parameterful (?) initializer
calling it, reverse this relationship. The reverse relationship matches bloom and blur and is
more common practice.
CCEffectRefraction - Use [CCTexture none] if the environment sprite (or its texture) is nil.
Merge remote-tracking branch 'upstream/develop' into develop