Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
# indra/newview/lllogchat.cpp
# indra/newview/llnotificationlistitem.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/lltoastgroupnotifypanel.cpp
# indra/newview/skins/default/xui/en/notifications.xml
# indra/newview/skins/default/xui/en/panel_group_roles.xml