merge

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/newview/llbottomtray.cpp

indra/newview/llchiclet.cpp

indra/newview/llfavoritesbar.cpp

indra/newview/llfloatercolorpicker.cpp

indra/newview/llfloatersnapshot.cpp

indra/newview/lllocationinputctrl.cpp

indra/newview/llnearbychat.cpp

indra/newview/lloutputmonitorctrl.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llparticipantlist.cpp

...view/skins/default/xui/en/panel_classifieds_list_item.xml

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

indra/newview/skins/default/xui/en/widgets/text_editor.xml