Merge branch 'master' into DRTVWR-486

doc/contributions.txt

indra/llui/llfloater.cpp

indra/llui/lluictrl.h

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/llxml/llcontrolgroupreader.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/camera/Front.xml

indra/newview/app_settings/camera/Rear.xml

indra/newview/app_settings/camera/Side.xml

indra/newview/app_settings/settings.xml

indra/newview/llagentcamera.cpp

indra/newview/llagentcamera.h

indra/newview/llfloatercamera.cpp

indra/newview/llfloatercamera.h

indra/newview/llfloatercamerapresets.cpp

indra/newview/llfloatercamerapresets.h

indra/newview/llfloaterdeleteprefpreset.cpp

indra/newview/llfloaterloadprefpreset.cpp