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