merge changes for storm-1838

doc/contributions.txt

indra/llmessage/llinstantmessage.h

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llchiclet.cpp

indra/newview/llconversationloglist.cpp

indra/newview/llconversationmodel.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llnotificationscripthandler.cpp

indra/newview/llpanelpeoplemenus.cpp

indra/newview/llpanelpeoplemenus.h

indra/newview/llsyswellwindow.cpp

indra/newview/llsyswellwindow.h

indra/newview/llviewermessage.cpp

indra/newview/skins/default/xui/en/menu_conversation.xml

...wview/skins/default/xui/en/menu_conversation_log_gear.xml

indra/newview/skins/default/xui/en/menu_inventory.xml

indra/newview/skins/default/xui/en/menu_people_nearby.xml

indra/newview/skins/default/xui/en/notifications.xml