Fix for zoom when highlighted
Added properties that can be used to adjust bloom/blur effects.
Merge remote-tracking branch 'upstream/develop' into develop
Merge branch 'develop' of github.com:osinoleg/cocos2d-iphone into oleg/develop

Conflicts:
	cocos2d/CCEffectBloom.h
	cocos2d/CCEffectBloom.m
	cocos2d/CCEffectGaussianBlur.h
Merge branch 'oleg/develop' into develop
CCSprite - Wrap some effect code in CC_ENABLE_EXPERIMENTAL_EFFECTS
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
blur/bloom blur properties now work as expected.
Merge pull request #873 from thayerandrews/develop

CCEffects - Designated initializer cleanup, fix nil environment in refraction
CCEffectRefraction - Address feedback from Viktor

- Fix the blend of the main texture and the refracted environment texture. It was a multiply, now it's a
  premultiplied alpha blend.
- If the refracted texture coordinates would index outside the environment texture, just return the main
  texture.
CCEffectRefraction - Crash fix when sprite texture / sprite frame is nil
CCSprite - Set the sprite's texture rect from the normal map if there is no main texture.
Merge remote-tracking branch 'upstream/develop' into develop
CCEffectRefraction - Remove conditional based on the refracted texture coordinates

Instead use abs(), min(), and step() to arrive at a flag that is 1.0 if the refracted coords are in bounds and
0.0 if they are out. Thanks to Scott for pointing out this alternative solution.
Merge pull request #874 from osinoleg/develop

blur/bloom blur properties now work as expected.
Merge remote-tracking branch 'upstream/develop' into develop
OS X Xcode project - Remove CCEffectGlow and add CCEffectBloom