merge

indra/newview/featuretable.txt

indra/newview/llagentcamera.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llcofwearables.cpp

indra/newview/llpanelclassified.cpp

indra/newview/llpanelclassified.h

indra/newview/llpaneleditwearable.cpp

indra/newview/llpaneloutfitedit.cpp

indra/newview/llscreenchannel.cpp

indra/newview/llvotree.cpp

indra/newview/pipeline.cpp

indra/newview/skins/default/textures/icons/Shop.png

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

...wview/skins/default/xui/en/floater_publish_classified.xml

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

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