Merge with tip

indra/newview/skins/default/colors.xml

indra/newview/skins/default/xui/pl/floater_build_options.xml

indra/newview/skins/default/xui/pl/floater_buy_currency.xml

indra/newview/skins/default/xui/pl/floater_customize.xml

indra/newview/skins/default/xui/pl/floater_im.xml

indra/newview/skins/default/xui/pl/floater_im_container.xml

indra/newview/skins/default/xui/pl/floater_openobject.xml

...newview/skins/default/xui/pl/floater_preview_notecard.xml

...a/newview/skins/default/xui/pl/floater_settings_debug.xml

indra/newview/skins/default/xui/pl/floater_top_objects.xml

.../newview/skins/default/xui/pl/floater_whitelist_entry.xml

indra/newview/skins/default/xui/pl/mime_types_linux.xml

indra/newview/skins/default/xui/pl/panel_edit_alpha.xml

indra/newview/skins/default/xui/pl/panel_edit_jacket.xml

indra/newview/skins/default/xui/pl/panel_edit_shoes.xml

indra/newview/skins/default/xui/pl/panel_edit_wearable.xml

indra/newview/skins/default/xui/pl/panel_my_profile.xml

indra/newview/skins/default/xui/pl/panel_nearby_chat.xml

indra/newview/skins/default/xui/pl/panel_place_profile.xml

...view/skins/default/xui/pl/panel_preferences_graphics1.xml