merge changes for latest project integration repo

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl

...wview/app_settings/shaders/class1/deferred/materialF.glsl

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl

...view/app_settings/shaders/class2/deferred/spotLightF.glsl

indra/newview/featuretable_mac.txt

indra/newview/llface.cpp

indra/newview/llviewershadermgr.cpp

indra/newview/llviewershadermgr.h

indra/newview/pipeline.cpp