Merge with latest

doc/contributions.txt

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/llui/llresizebar.cpp

indra/llui/llresizebar.h

indra/llui/llscrollcontainer.cpp

indra/llui/llui.cpp

indra/llui/llview.cpp

indra/llui/llwindowshade.cpp

indra/llui/llwindowshade.h

indra/llwindow/llwindowwin32.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/commands.xml

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llchathistory.cpp

indra/newview/llchicletbar.cpp

indra/newview/llfloaterland.cpp

indra/newview/llfloatermodelpreview.cpp