Merge branch 'master' into DRTVWR-568

doc/contributions.txt

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/lliconctrl.cpp

indra/llui/lliconctrl.h

indra/llui/llmenubutton.cpp

indra/llui/llmenubutton.h

indra/llui/lltabcontainer.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/commands.xml

indra/newview/llagentpicksinfo.h

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llavatarpropertiesprocessor.cpp

indra/newview/llavatarpropertiesprocessor.h

indra/newview/llcallingcard.cpp

indra/newview/llfloaterchatvoicevolume.cpp