merge storm-2082 changes

doc/contributions.txt

indra/newview/CMakeLists.txt

indra/newview/app_settings/high_graphics.xml

indra/newview/app_settings/low_graphics.xml

indra/newview/app_settings/mid_graphics.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/ultra_graphics.xml

indra/newview/llappviewer.cpp

indra/newview/llavatarrenderinfoaccountant.cpp

indra/newview/llavatarrenderinfoaccountant.h

indra/newview/llfloaterdeleteprefpreset.cpp

indra/newview/llfloaterdeleteprefpreset.h

indra/newview/llfloaterhardwaresettings.cpp

indra/newview/llfloaterloadprefpreset.cpp

indra/newview/llfloaterloadprefpreset.h

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloatersaveprefpreset.cpp

indra/newview/llfloatersaveprefpreset.h

indra/newview/llpanelnearbymedia.cpp