Adding rough support for iPhone 6 and 6+.
Merge pull request #1056 from slembcke/develop

Adding rough support for iPhone 6 and 6+.
Mac shader fix.
Merge pull request #1055 from thayerandrews/develop

CCEffectLighting - Add automatic light collection
CCEffects - Fix two compiler warnings
Merge remote-tracking branch 'upstream/develop' into develop