Merge

indra/newview/llbottomtray.cpp

indra/newview/llchathistory.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloatersidepanelcontainer.cpp

indra/newview/llfloatersidepanelcontainer.h

indra/newview/llgroupactions.cpp

indra/newview/llnearbychat.cpp

indra/newview/llpanelblockedlist.cpp

indra/newview/llpanelgroup.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpicks.cpp

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

...ew/skins/default/xui/en/menu_people_friends_view_sort.xml

...iew/skins/default/xui/en/menu_people_nearby_view_sort.xml

...iew/skins/default/xui/en/menu_people_recent_view_sort.xml