Automated merge with https://bitbucket.org/lindenlab/viewer-development

indra/llcommon/llstring.cpp

indra/llui/llbutton.cpp

indra/llui/lllayoutstack.h

indra/llui/llmenugl.cpp

indra/llui/llpanel.h

indra/llui/llscrolllistcell.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/llview.cpp

indra/llui/llview.h

indra/llui/llwindowshade.cpp

indra/llui/llwindowshade.h

indra/llwindow/llwindow.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llchiclet.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfloatercolorpicker.cpp