Merge

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/llui/lluicolortable.cpp

indra/llui/lluicolortable.h

indra/newview/llavataractions.cpp

indra/newview/llcallingcard.cpp

indra/newview/llchathistory.cpp

indra/newview/llchatitemscontainerctrl.cpp

indra/newview/llpanelgroup.cpp

indra/newview/llpanelgroup.h

indra/newview/llpanelgroupgeneral.cpp

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

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

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

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

...ewview/skins/default/xui/en/panel_group_info_sidetray.xml