merge changes for storm-825

doc/contributions.txt

indra/llui/llfloater.cpp

indra/newview/featuretable.txt

indra/newview/featuretable_linux.txt

indra/newview/featuretable_mac.txt

indra/newview/featuretable_xp.txt

indra/newview/llfloatermap.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llnetmap.cpp

indra/newview/llpanelmaininventory.cpp

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

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

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

...a/newview/skins/default/xui/en/panel_group_land_money.xml

.../newview/skins/default/xui/en/panel_preferences_sound.xml