merge changes for STORM-2040

doc/contributions.txt

indra/newview/app_settings/settings.xml

indra/newview/llfloaterfacebook.cpp

indra/newview/llfloaterfacebook.h

indra/newview/llfloaterflickr.cpp

indra/newview/llfloaterflickr.h

indra/newview/llfloatersnapshot.cpp

indra/newview/llfloatertwitter.cpp

indra/newview/llfloatertwitter.h

indra/newview/llpanelsnapshot.cpp

indra/newview/llpanelsnapshot.h

indra/newview/llpanelsnapshotinventory.cpp

indra/newview/llpanelsnapshotoptions.cpp

indra/newview/llpanelsnapshotpostcard.cpp

indra/newview/llsnapshotlivepreview.cpp

indra/newview/skins/default/xui/de/floater_snapshot.xml

...a/newview/skins/default/xui/de/panel_postcard_message.xml

.../newview/skins/default/xui/de/panel_postcard_settings.xml

...newview/skins/default/xui/de/panel_snapshot_inventory.xml

indra/newview/skins/default/xui/de/panel_snapshot_local.xml