CCEffectLighting - Limit shininess range to [0..1]

Internally, map this to [1..100] for use by the fragment shader.
CCEffectLighting - Fix specular contribution of directional lights
Merge remote-tracking branch 'upstream/develop' into develop
CCLightCollection - If a light node isn't visible, it doesn't light things

When determining the set of lights that will contribute to a lighting effect,
consider each light node's visibility property in addition to its group mask.
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	cocos2d/CCEffectLighting.m
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of https://github.com/thayerandrews/cocos2d-iphone into develop