Pull merge from lindenlab/viewer-chui

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimsession.cpp

indra/newview/llfloaterimsession.h

indra/newview/llgroupactions.cpp

indra/newview/llgroupactions.h

indra/newview/llimview.cpp

indra/newview/lllogchat.cpp

indra/newview/lllogchat.h

indra/newview/lltoastimpanel.cpp

indra/newview/lltoastimpanel.h

indra/newview/llviewerwindow.cpp

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

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