Merge branch 'upstream' into tizen

Merge branch 'upstream' into tizen

Conflicts:
	.gitignore
	.mailmap
	AUTHORS
	NEWS
	README
	README.wayland
	autogen.sh
	config/default/e.src
	config/default/profile.desktop
	config/mobile/e.src
	config/mobile/e_bindings.src
	config/mobile/profile.desktop
	config/standard/e.src
	config/standard/e_bindings.src
	config/standard/profile.desktop
	config/tiling/e.src
	config/tiling/e_bindings.src
	config/tiling/module.tiling.src
	config/tiling/profile.desktop
	configure.ac
	data/Makefile.mk
	data/desktop/enlightenment_filemanager.desktop
	data/etc/sysactions.conf.in
	data/favorites/desktop.desktop
	data/favorites/home.desktop
	data/favorites/root.desktop
	data/favorites/tmp.desktop
	data/input_methods/fcitx.imc
	data/input_methods/gcin.imc
	data/input_methods/hime.imc
	data/tools/enlightenment_remote
	data/xsession/enlightenment.desktop.in
	netwm.txt
	po/POTFILES.in
	po/ar.po
	po/bg.po
	po/ca.po
	po/cs.po
	po/da.po
	po/de.po
	po/el.po
	po/eo.po
	po/es.po
	po/et.po
	po/fi.po
	po/fo.po
	po/fr.po
	po/fr_CH.po
	po/gl.po
	po/he.po
	po/hr.po
	po/hu.po
	po/it.po
	po/ja.po
	po/km.po
	po/ko.po
	po/lt.po
	po/ms.po
	po/nb.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/pt_BR.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sl.po
	po/sr.po
	po/sv.po
	po/tr.po
	po/uk.po
	po/zh_CN.po
	po/zh_TW.po
	src/bin/Makefile.mk
	src/bin/e.h
	src/bin/e_about.c
	src/bin/e_actions.c
	src/bin/e_alert.c
	src/bin/e_alert_main.c
	src/bin/e_atoms.c
	src/bin/e_atoms.h
	src/bin/e_auth.c
	src/bin/e_auth.h
	src/bin/e_backlight.c
	src/bin/e_bg.c
	src/bin/e_bindings.c
	src/bin/e_client.c
	src/bin/e_client.h
	src/bin/e_color_dialog.c
	src/bin/e_comp.c
	src/bin/e_comp.h
	src/bin/e_comp_canvas.c
	src/bin/e_comp_canvas.h
	src/bin/e_comp_cfdata.c
	src/bin/e_comp_cfdata.h
	src/bin/e_comp_object.c
	src/bin/e_comp_object.h
	src/bin/e_comp_wl.c
	src/bin/e_comp_wl.h
	src/bin/e_comp_wl_data.c
	src/bin/e_comp_wl_input.c
	src/bin/e_comp_x.c
	src/bin/e_comp_x.h
	src/bin/e_config.c
	src/bin/e_config.h
	src/bin/e_config_dialog.c
	src/bin/e_config_dialog.h
	src/bin/e_configure.c
	src/bin/e_configure.h
	src/bin/e_confirm_dialog.c
	src/bin/e_desk.c
	src/bin/e_desklock.c
	src/bin/e_deskmirror.c
	src/bin/e_desktop_editor.c
	src/bin/e_dialog.c
	src/bin/e_dialog.h
	src/bin/e_dnd.c
	src/bin/e_dpms.c
	src/bin/e_entry_dialog.c
	src/bin/e_exec.c
	src/bin/e_fm.c
	src/bin/e_fm/Makefile.mk
	src/bin/e_fm/e_fm_ipc.c
	src/bin/e_fm/e_fm_main_eeze.c
	src/bin/e_fm_op.h
	src/bin/e_fm_prop.c
	src/bin/e_fm_shared_device.c
	src/bin/e_font.c
	src/bin/e_gadcon.c
	src/bin/e_gadcon_popup.c
	src/bin/e_grab_dialog.c
	src/bin/e_grab_dialog.h
	src/bin/e_grabinput.c
	src/bin/e_hints.c
	src/bin/e_hints.h
	src/bin/e_ilist.c
	src/bin/e_import_config_dialog.c
	src/bin/e_import_config_dialog.h
	src/bin/e_import_dialog.c
	src/bin/e_import_dialog.h
	src/bin/e_includes.h
	src/bin/e_init.c
	src/bin/e_int_client_locks.c
	src/bin/e_int_client_menu.c
	src/bin/e_int_client_prop.c
	src/bin/e_int_client_remember.c
	src/bin/e_int_config_comp.c
	src/bin/e_int_config_comp_match.c
	src/bin/e_int_config_modules.c
	src/bin/e_int_config_modules.h
	src/bin/e_int_gadcon_config.c
	src/bin/e_int_menus.c
	src/bin/e_int_shelf_config.c
	src/bin/e_int_toolbar_config.c
	src/bin/e_livethumb.c
	src/bin/e_main.c
	src/bin/e_menu.c
	src/bin/e_module.c
	src/bin/e_mouse.c
	src/bin/e_moveresize.c
	src/bin/e_msgbus.c
	src/bin/e_notification.c
	src/bin/e_obj_dialog.c
	src/bin/e_obj_dialog.h
	src/bin/e_object.h
	src/bin/e_order.c
	src/bin/e_pixmap.c
	src/bin/e_pixmap.h
	src/bin/e_pointer.c
	src/bin/e_pointer.h
	src/bin/e_remember.c
	src/bin/e_scale.c
	src/bin/e_screensaver.c
	src/bin/e_shelf.c
	src/bin/e_signals.c
	src/bin/e_start_main.c
	src/bin/e_startup.c
	src/bin/e_sys.c
	src/bin/e_sys_main.c
	src/bin/e_test.c
	src/bin/e_theme_about.c
	src/bin/e_toolbar.c
	src/bin/e_toolbar.h
	src/bin/e_update.c
	src/bin/e_utils.c
	src/bin/e_utils.h
	src/bin/e_widget.c
	src/bin/e_widget_bgpreview.c
	src/bin/e_widget_button.c
	src/bin/e_widget_config_list.c
	src/bin/e_widget_config_list.h
	src/bin/e_widget_csel.c
	src/bin/e_widget_entry.c
	src/bin/e_widget_entry.h
	src/bin/e_widget_filepreview.c
	src/bin/e_widget_framelist.c
	src/bin/e_widget_frametable.c
	src/bin/e_widget_fsel.c
	src/bin/e_widget_label.c
	src/bin/e_widget_list.c
	src/bin/e_widget_table.c
	src/bin/e_widget_table.h
	src/bin/e_widget_textblock.c
	src/bin/e_widget_toolbar.c
	src/bin/e_widget_toolbook.c
	src/bin/e_win.c
	src/bin/e_win.h
	src/bin/e_xinerama.c
	src/bin/e_xsettings.c
	src/bin/e_zone.c
	src/bin/e_zone.h
	src/modules/Makefile.mk
	src/modules/Makefile_conf_display.mk
	src/modules/Makefile_conf_randr.mk
	src/modules/Makefile_everything.mk
	src/modules/Makefile_systray.mk
	src/modules/access/e_mod_main.c
	src/modules/access/module.desktop.in
	src/modules/appmenu/e_mod_dbus_registrar_server.c
	src/modules/appmenu/module.desktop.in
	src/modules/backlight/e_mod_main.c
	src/modules/backlight/module.desktop.in
	src/modules/battery/e_mod_config.c
	src/modules/battery/e_mod_main.c
	src/modules/battery/e_mod_main.h
	src/modules/battery/module.desktop.in
	src/modules/bluez4/agent.c
	src/modules/bluez4/e_mod_main.c
	src/modules/bluez4/ebluez4.c
	src/modules/bluez4/module.desktop.in
	src/modules/clock/e_mod_config.c
	src/modules/clock/e_mod_main.c
	src/modules/clock/e_mod_main.h
	src/modules/clock/module.desktop.in
	src/modules/conf/e_conf.c
	src/modules/conf/e_mod_config.c
	src/modules/conf/e_mod_main.c
	src/modules/conf/e_mod_main.h
	src/modules/conf/module.desktop.in
	src/modules/conf_applications/e_int_config_apps.c
	src/modules/conf_applications/e_int_config_apps_personal.c
	src/modules/conf_applications/e_int_config_defapps.c
	src/modules/conf_applications/e_int_config_deskenv.c
	src/modules/conf_applications/e_mod_main.h
	src/modules/conf_applications/module.desktop.in
	src/modules/conf_bindings/e_int_config_acpibindings.c
	src/modules/conf_bindings/e_int_config_edgebindings.c
	src/modules/conf_bindings/e_int_config_keybindings.c
	src/modules/conf_bindings/e_int_config_mousebindings.c
	src/modules/conf_bindings/e_int_config_signalbindings.c
	src/modules/conf_bindings/e_mod_main.h
	src/modules/conf_bindings/module.desktop.in
	src/modules/conf_dialogs/e_int_config_dialogs.c
	src/modules/conf_dialogs/e_int_config_profiles.c
	src/modules/conf_dialogs/e_mod_main.h
	src/modules/conf_dialogs/module.desktop.in
	src/modules/conf_display/e_int_config_desk.c
	src/modules/conf_display/e_int_config_desklock.c
	src/modules/conf_display/e_int_config_desklock_fsel.c
	src/modules/conf_display/e_int_config_desks.c
	src/modules/conf_display/e_int_config_dpms.c
	src/modules/conf_display/e_int_config_screensaver.c
	src/modules/conf_display/e_mod_main.h
	src/modules/conf_display/module.desktop.in
	src/modules/conf_interaction/e_int_config_interaction.c
	src/modules/conf_interaction/e_int_config_mouse.c
	src/modules/conf_interaction/e_mod_main.h
	src/modules/conf_interaction/module.desktop.in
	src/modules/conf_intl/e_int_config_imc.c
	src/modules/conf_intl/e_int_config_imc_import.c
	src/modules/conf_intl/e_int_config_intl.c
	src/modules/conf_intl/e_mod_main.h
	src/modules/conf_intl/module.desktop.in
	src/modules/conf_menus/e_int_config_menus.c
	src/modules/conf_menus/e_mod_main.h
	src/modules/conf_menus/module.desktop.in
	src/modules/conf_paths/e_int_config_env.c
	src/modules/conf_paths/e_int_config_paths.c
	src/modules/conf_paths/e_mod_main.h
	src/modules/conf_paths/module.desktop.in
	src/modules/conf_performance/e_int_config_performance.c
	src/modules/conf_performance/e_int_config_powermanagement.c
	src/modules/conf_performance/e_mod_main.h
	src/modules/conf_performance/module.desktop.in
	src/modules/conf_randr/e_int_config_randr.c
	src/modules/conf_randr/e_int_config_randr.h
	src/modules/conf_randr/e_mod_main.c
	src/modules/conf_randr/e_mod_main.h
	src/modules/conf_randr/e_smart_monitor.c
	src/modules/conf_randr/e_smart_randr.c
	src/modules/conf_randr/module.desktop.in
	src/modules/conf_shelves/e_int_config_shelf.c
	src/modules/conf_shelves/e_int_config_shelf.h
	src/modules/conf_shelves/e_mod_main.c
	src/modules/conf_shelves/e_mod_main.h
	src/modules/conf_shelves/module.desktop.in
	src/modules/conf_theme/e_int_config_borders.c
	src/modules/conf_theme/e_int_config_color_classes.c
	src/modules/conf_theme/e_int_config_fonts.c
	src/modules/conf_theme/e_int_config_scale.c
	src/modules/conf_theme/e_int_config_theme.c
	src/modules/conf_theme/e_int_config_theme_import.c
	src/modules/conf_theme/e_int_config_transitions.c
	src/modules/conf_theme/e_int_config_wallpaper.c
	src/modules/conf_theme/e_int_config_xsettings.c
	src/modules/conf_theme/e_mod_main.c
	src/modules/conf_theme/e_mod_main.h
	src/modules/conf_theme/module.desktop.in
	src/modules/conf_window_manipulation/e_int_config_clientlist.c
	src/modules/conf_window_manipulation/e_int_config_focus.c
	src/modules/conf_window_manipulation/e_int_config_window_display.c
	src/modules/conf_window_manipulation/e_int_config_window_geometry.c
	src/modules/conf_window_manipulation/e_int_config_window_process.c
	src/modules/conf_window_manipulation/e_mod_main.h
	src/modules/conf_window_manipulation/module.desktop.in
	src/modules/conf_window_remembers/e_int_config_remembers.c
	src/modules/conf_window_remembers/e_mod_main.h
	src/modules/conf_window_remembers/module.desktop.in
	src/modules/connman/agent.c
	src/modules/connman/e_connman.c
	src/modules/connman/e_mod_config.c
	src/modules/connman/e_mod_main.c
	src/modules/connman/e_mod_main.h
	src/modules/connman/module.desktop.in
	src/modules/contact/e_edges.c
	src/modules/contact/e_policy.c
	src/modules/contact/module.desktop.in
	src/modules/cpufreq/e_mod_config.c
	src/modules/cpufreq/e_mod_main.c
	src/modules/cpufreq/e_mod_main.h
	src/modules/cpufreq/freqset.c
	src/modules/cpufreq/module.desktop.in
	src/modules/everything/e_mod_main.h
	src/modules/everything/evry.c
	src/modules/everything/evry_config.c
	src/modules/everything/evry_gadget.c
	src/modules/everything/evry_history.c
	src/modules/everything/evry_plug_actions.c
	src/modules/everything/evry_plug_apps.c
	src/modules/everything/evry_plug_calc.c
	src/modules/everything/evry_plug_clipboard.c
	src/modules/everything/evry_plug_files.c
	src/modules/everything/evry_types.h
	src/modules/everything/evry_view.c
	src/modules/everything/evry_view_help.c
	src/modules/everything/evry_view_tabs.c
	src/modules/everything/module.desktop.in
	src/modules/fileman/e_fwin.c
	src/modules/fileman/e_fwin_nav.c
	src/modules/fileman/e_int_config_mime.c
	src/modules/fileman/e_int_config_mime_edit.c
	src/modules/fileman/e_mod_config.c
	src/modules/fileman/e_mod_dbus.c
	src/modules/fileman/e_mod_main.c
	src/modules/fileman/e_mod_main.h
	src/modules/fileman/e_mod_menu.c
	src/modules/fileman/module.desktop.in
	src/modules/fileman_opinfo/e_mod_main.c
	src/modules/fileman_opinfo/module.desktop.in
	src/modules/gadman/e_mod_config.c
	src/modules/gadman/e_mod_gadman.c
	src/modules/gadman/e_mod_gadman.h
	src/modules/gadman/e_mod_main.c
	src/modules/gadman/module.desktop.in
	src/modules/ibar/e_mod_config.c
	src/modules/ibar/e_mod_main.c
	src/modules/ibar/module.desktop.in
	src/modules/ibox/e_mod_config.c
	src/modules/ibox/e_mod_main.c
	src/modules/ibox/module.desktop.in
	src/modules/illume-bluetooth/module.desktop.in
	src/modules/illume-home-toggle/module.desktop.in
	src/modules/illume-home/e_busycover.c
	src/modules/illume-home/e_mod_config.c
	src/modules/illume-home/e_mod_main.c
	src/modules/illume-home/module.desktop.in
	src/modules/illume-indicator/e_mod_ind_win.c
	src/modules/illume-indicator/e_mod_notify.c
	src/modules/illume-indicator/module.desktop.in
	src/modules/illume-kbd-toggle/module.desktop.in
	src/modules/illume-keyboard/e_kbd_int.c
	src/modules/illume-keyboard/e_mod_config.c
	src/modules/illume-keyboard/module.desktop.in
	src/modules/illume-mode-toggle/module.desktop.in
	src/modules/illume-softkey/e_mod_sft_win.c
	src/modules/illume-softkey/module.desktop.in
	src/modules/illume2/e_mod_config_animation.c
	src/modules/illume2/e_mod_config_policy.c
	src/modules/illume2/e_mod_config_windows.c
	src/modules/illume2/e_mod_main.c
	src/modules/illume2/module.desktop.in
	src/modules/layout/module.desktop.in
	src/modules/lokker/e_mod_main.h
	src/modules/lokker/lokker.c
	src/modules/mixer/app_mixer.c
	src/modules/mixer/conf_gadget.c
	src/modules/mixer/conf_module.c
	src/modules/mixer/e_mod_main.c
	src/modules/mixer/e_mod_main.h
	src/modules/mixer/module.desktop.in
	src/modules/mixer/pa.c
	src/modules/msgbus/module.desktop.in
	src/modules/msgbus/msgbus_audit.c
	src/modules/msgbus/msgbus_desktop.c
	src/modules/music-control/e_mod_main.c
	src/modules/music-control/gen/eldbus_media_player2_player.c
	src/modules/music-control/gen/eldbus_mpris_media_player2.c
	src/modules/music-control/module.desktop.in
	src/modules/music-control/ui.c
	src/modules/notification/e_mod_config.c
	src/modules/notification/e_mod_main.c
	src/modules/notification/e_mod_main.h
	src/modules/notification/e_mod_popup.c
	src/modules/notification/module.desktop.in
	src/modules/packagekit/e_mod_config.c
	src/modules/packagekit/e_mod_packagekit.c
	src/modules/packagekit/module.desktop.in
	src/modules/pager/e_mod_config.c
	src/modules/pager/e_mod_main.c
	src/modules/pager/module.desktop.in
	src/modules/pager_plain/e_mod_config.c
	src/modules/pager_plain/e_mod_main.c
	src/modules/pager_plain/module.desktop.in
	src/modules/policy_mobile/e_mod_config.c
	src/modules/policy_mobile/e_mod_main.c
	src/modules/policy_mobile/e_mod_main.h
	src/modules/quickaccess/e_mod_config.c
	src/modules/quickaccess/e_mod_main.h
	src/modules/quickaccess/e_mod_quickaccess.c
	src/modules/quickaccess/module.desktop.in
	src/modules/shot/e_mod_main.c
	src/modules/shot/module.desktop.in
	src/modules/start/module.desktop.in
	src/modules/syscon/e_int_config_syscon.c
	src/modules/syscon/e_mod_main.h
	src/modules/syscon/module.desktop.in
	src/modules/systray/e_mod_main.c
	src/modules/systray/e_mod_main.h
	src/modules/systray/e_mod_notifier_host.c
	src/modules/systray/e_mod_notifier_watcher.c
	src/modules/systray/module.desktop.in
	src/modules/tasks/e_mod_config.c
	src/modules/tasks/e_mod_main.c
	src/modules/tasks/module.desktop.in
	src/modules/teamwork/e_mod_config.c
	src/modules/teamwork/e_mod_main.h
	src/modules/teamwork/e_mod_tw.c
	src/modules/teamwork/module.desktop.in
	src/modules/temperature/e_mod_main.h
	src/modules/temperature/module.desktop.in
	src/modules/tiling/e_mod_config.c
	src/modules/tiling/e_mod_tiling.c
	src/modules/tiling/e_mod_tiling.h
	src/modules/tiling/module.desktop.in
	src/modules/tiling/window_tree.c
	src/modules/tiling/window_tree.h
	src/modules/winlist/e_int_config_winlist.c
	src/modules/winlist/e_mod_main.h
	src/modules/winlist/e_winlist.c
	src/modules/winlist/module.desktop.in
	src/modules/wizard/data/desktop/home.desktop
	src/modules/wizard/data/desktop/root.desktop
	src/modules/wizard/data/desktop/tmp.desktop
	src/modules/wizard/e_wizard.c
	src/modules/wizard/module.desktop.in
	src/modules/wizard/page_010.c
	src/modules/wl_desktop_shell/e_desktop_shell_protocol.c
	src/modules/wl_desktop_shell/e_desktop_shell_protocol.h
	src/modules/wl_desktop_shell/e_mod_main.c
	src/modules/wl_desktop_shell/module.desktop.in
	src/modules/wl_drm/e_mod_main.c
	src/modules/wl_fb/e_mod_main.c
	src/modules/wl_screenshot/module.desktop.in
	src/modules/wl_x11/e_mod_main.c
	src/modules/xkbswitch/e_mod_config.c
	src/modules/xkbswitch/e_mod_main.c
	src/modules/xkbswitch/e_mod_main.h
	src/modules/xkbswitch/module.desktop.in

Change-Id: I48aa3471cf5fb5521116027596e592e873c3d8ee