Merge branch 'master' of git.alchemyviewer.org:NiranV.Dean/blackdragon

# Conflicts:
#	indra/newview/skins/default/xui/ja/control_table_contents_camera.xml
#	indra/newview/skins/default/xui/ja/control_table_contents_movement.xml
#	indra/newview/skins/default/xui/ja/floater_360capture.xml
#	indra/newview/skins/default/xui/ja/floater_aaa.xml
#	indra/newview/skins/default/xui/ja/floater_about.xml
#	indra/newview/skins/default/xui/ja/floater_add_payment_method.xml
#	indra/newview/skins/default/xui/ja/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/ja/floater_camera.xml
#	indra/newview/skins/default/xui/ja/floater_classified.xml
#	indra/newview/skins/default/xui/ja/floater_forget_user.xml
#	indra/newview/skins/default/xui/ja/floater_linkreplace.xml
#	indra/newview/skins/default/xui/ja/floater_outfit_photo_preview.xml
#	indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml
#	indra/newview/skins/default/xui/ja/floater_test_combobox.xml
#	indra/newview/skins/default/xui/ja/floater_test_inspectors.xml
#	indra/newview/skins/default/xui/ja/floater_test_line_editor.xml
#	indra/newview/skins/default/xui/ja/floater_test_text_editor.xml
#	indra/newview/skins/default/xui/ja/floater_tools.xml
#	indra/newview/skins/default/xui/ja/floater_ui_preview.xml
#	indra/newview/skins/default/xui/ja/fonts.xml
#	indra/newview/skins/default/xui/ja/menu_copy_paste_features.xml
#	indra/newview/skins/default/xui/ja/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/ja/menu_inventory_search_visibility.xml
#	indra/newview/skins/default/xui/ja/menu_name_field.xml
#	indra/newview/skins/default/xui/ja/menu_places_gear_sorting.xml
#	indra/newview/skins/default/xui/ja/menu_teleport_history_item.xml
#	indra/newview/skins/default/xui/ja/menu_viewer.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/ja/panel_camera_preset_item.xml
#	indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/ja/panel_group_list_item_short.xml
#	indra/newview/skins/default/xui/ja/panel_group_roles.xml
#	indra/newview/skins/default/xui/ja/panel_hide_beacon.xml
#	indra/newview/skins/default/xui/ja/panel_login.xml
#	indra/newview/skins/default/xui/ja/panel_main_inventory.xml
#	indra/newview/skins/default/xui/ja/panel_notification.xml
#	indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_controls.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/ja/panel_presets_camera_pulldown.xml
#	indra/newview/skins/default/xui/ja/panel_profile_classified.xml
#	indra/newview/skins/default/xui/ja/panel_profile_classifieds.xml
#	indra/newview/skins/default/xui/ja/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/ja/panel_profile_interests.xml
#	indra/newview/skins/default/xui/ja/panel_profile_pick.xml
#	indra/newview/skins/default/xui/ja/panel_profile_picks.xml
#	indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/ja/panel_profile_web.xml
#	indra/newview/skins/default/xui/ja/panel_progress.xml
#	indra/newview/skins/default/xui/ja/panel_region_environment.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/ja/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_folder.xml
#	indra/newview/skins/default/xui/ja/widgets/inbox_folder_view_item.xml
#	indra/newview/skins/default/xui/ja/widgets/menu_item_separator.xml
#	indra/newview/skins/default/xui/ja/widgets/menu_item_tear_off.xml
#	indra/newview/skins/default/xui/ja/widgets/sun_moon_trackball.xml
#	indra/newview/skins/default/xui/ja/widgets/wearable_outfit_list_item.xml