Pull merge from lindenlab/viewer-acme

indra/newview/CMakeLists.txt

indra/newview/app_settings/commands.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/toolbars.xml

indra/newview/llfacebookconnect.cpp

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/llpanelsnapshotoptions.cpp

indra/newview/llsnapshotlivepreview.cpp

indra/newview/llviewerfloaterreg.cpp

indra/newview/skins/default/textures/textures.xml

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

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

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

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