Merge remote-tracking branch 'remotes/origin/upstream'

Merge remote-tracking branch 'remotes/origin/upstream'

Conflicts:
	.gitignore
	AUTHORS
	README
	config/Makefile.am
	config/default/base.src
	config/illume/base.src
	config/standard/base.src
	configure.ac
	data/edje_externals/Makefile.am
	data/edje_externals/icons.edc
	data/images/Makefile.am
	data/objects/test.edc
	data/themes/Makefile.am
	data/themes/default.edc
	data/themes/widgets/button.edc
	data/themes/widgets/ctxpopup.edc
	data/themes/widgets/entry.edc
	data/themes/widgets/flipselector.edc
	data/themes/widgets/genlist.edc
	data/themes/widgets/index.edc
	data/themes/widgets/label.edc
	data/themes/widgets/map.edc
	data/themes/widgets/naviframe.edc
	data/themes/widgets/panel.edc
	data/themes/widgets/panes.edc
	data/themes/widgets/toolbar.edc
	doc/Makefile.am
	doc/examples.dox
	doc/index.doxy
	doc/widgets/Makefile.am
	doc/widgets/widget_preview_ctxpopup.c
	doc/widgets/widget_preview_flip.c
	doc/widgets/widget_preview_genlist1.c
	doc/widgets/widget_preview_icon.c
	doc/widgets/widget_preview_image.c
	doc/widgets/widget_preview_index.c
	doc/widgets/widget_preview_mapbuf.c
	elementary.spec.in
	m4/efl_binary.m4
	po/POTFILES.in
	po/ar.po
	po/az_IR.po
	po/cs.po
	po/de.po
	po/fa.po
	po/fr.po
	po/he.po
	po/it.po
	po/ko_KR.po
	po/nl.po
	po/ps.po
	po/pt.po
	po/ur.po
	po/yi.po
	src/bin/Makefile.am
	src/bin/config.c
	src/bin/quicklaunch.c
	src/bin/test.c
	src/bin/test_3d.c
	src/bin/test_actionslider.c
	src/bin/test_bg.c
	src/bin/test_box.c
	src/bin/test_bubble.c
	src/bin/test_button.c
	src/bin/test_calendar.c
	src/bin/test_check.c
	src/bin/test_clock.c
	src/bin/test_cnp.c
	src/bin/test_colorselector.c
	src/bin/test_conform.c
	src/bin/test_ctxpopup.c
	src/bin/test_cursor.c
	src/bin/test_diskselector.c
	src/bin/test_eio.c
	src/bin/test_entry.c
	src/bin/test_factory.c
	src/bin/test_fileselector_button.c
	src/bin/test_fileselector_entry.c
	src/bin/test_flip.c
	src/bin/test_flip_page.c
	src/bin/test_flipselector.c
	src/bin/test_focus.c
	src/bin/test_focus2.c
	src/bin/test_focus3.c
	src/bin/test_gengrid.c
	src/bin/test_genlist.c
	src/bin/test_gesture_layer2.c
	src/bin/test_gesture_layer3.c
	src/bin/test_glview.c
	src/bin/test_glview_simple.c
	src/bin/test_grid.c
	src/bin/test_hover.c
	src/bin/test_hoversel.c
	src/bin/test_icon.c
	src/bin/test_icon_animated.c
	src/bin/test_index.c
	src/bin/test_inwin.c
	src/bin/test_label.c
	src/bin/test_launcher.c
	src/bin/test_list.c
	src/bin/test_map.c
	src/bin/test_menu.c
	src/bin/test_multibuttonentry.c
	src/bin/test_naviframe.c
	src/bin/test_notify.c
	src/bin/test_panel.c
	src/bin/test_photo.c
	src/bin/test_photocam.c
	src/bin/test_radio.c
	src/bin/test_scroller.c
	src/bin/test_separator.c
	src/bin/test_spinner.c
	src/bin/test_store.c
	src/bin/test_table.c
	src/bin/test_toggle.c
	src/bin/test_toolbar.c
	src/bin/test_tooltip.c
	src/bin/test_transit.c
	src/bin/test_weather.c
	src/bin/test_web.c
	src/bin/test_win_inline.c
	src/bin/test_win_plug.c
	src/bin/test_win_socket.c
	src/bin/test_win_state.c
	src/edje_externals/Makefile.am
	src/edje_externals/elm.c
	src/edje_externals/elm_button.c
	src/edje_externals/elm_calendar.c
	src/edje_externals/elm_entry.c
	src/edje_externals/elm_gengrid.c
	src/edje_externals/elm_genlist.c
	src/edje_externals/elm_icon.c
	src/edje_externals/elm_index.c
	src/edje_externals/elm_list.c
	src/edje_externals/elm_map.c
	src/edje_externals/elm_multibuttonentry.c
	src/edje_externals/elm_notify.c
	src/edje_externals/elm_segment_control.c
	src/edje_externals/elm_toolbar.c
	src/edje_externals/elm_video.c
	src/edje_externals/modules.inc
	src/examples/Makefile.am
	src/examples/anchorblock_example_01.c
	src/examples/bubble_example_01.c
	src/examples/button_example_01.c
	src/examples/calendar_example_05.c
	src/examples/clock_example.c
	src/examples/ctxpopup_example_01.c
	src/examples/diskselector_example_01.c
	src/examples/entry_example.c
	src/examples/flip_example_01.c
	src/examples/general_funcs_example.c
	src/examples/gengrid_example.c
	src/examples/genlist_example_01.c
	src/examples/genlist_example_02.c
	src/examples/genlist_example_03.c
	src/examples/genlist_example_04.c
	src/examples/genlist_example_05.c
	src/examples/icon_example_01.c
	src/examples/image_example_01.c
	src/examples/index_example_01.c
	src/examples/index_example_02.c
	src/examples/inwin_example.c
	src/examples/list_example_02.c
	src/examples/list_example_03.c
	src/examples/map_example_01.c
	src/examples/map_example_02.c
	src/examples/map_example_03.c
	src/examples/mapbuf_example.c
	src/examples/menu_example_01.c
	src/examples/photocam_example_01.c
	src/examples/slider_example.c
	src/examples/slideshow_example.c
	src/examples/theme_example_01.c
	src/examples/web_example.c
	src/examples/win_example.c
	src/lib/Elementary.h.in
	src/lib/Makefile.am
	src/lib/elc_ctxpopup.c
	src/lib/elc_ctxpopup.h
	src/lib/elc_fileselector.c
	src/lib/elc_fileselector_button.c
	src/lib/elc_fileselector_button.h
	src/lib/elc_fileselector_entry.c
	src/lib/elc_fileselector_entry.h
	src/lib/elc_hoversel.c
	src/lib/elc_hoversel.h
	src/lib/elc_multibuttonentry.c
	src/lib/elc_multibuttonentry.h
	src/lib/elc_naviframe.c
	src/lib/elc_naviframe.h
	src/lib/elc_player.c
	src/lib/elc_scrolled_entry.c
	src/lib/elm_access.c
	src/lib/elm_actionslider.c
	src/lib/elm_actionslider.h
	src/lib/elm_app.h
	src/lib/elm_bg.c
	src/lib/elm_bg.h
	src/lib/elm_box.c
	src/lib/elm_box.h
	src/lib/elm_bubble.c
	src/lib/elm_bubble.h
	src/lib/elm_button.c
	src/lib/elm_button.h
	src/lib/elm_cache.h
	src/lib/elm_calendar.c
	src/lib/elm_calendar.h
	src/lib/elm_check.c
	src/lib/elm_check.h
	src/lib/elm_clock.c
	src/lib/elm_clock.h
	src/lib/elm_cnp.h
	src/lib/elm_colorselector.c
	src/lib/elm_colorselector.h
	src/lib/elm_config.c
	src/lib/elm_config.h
	src/lib/elm_conform.c
	src/lib/elm_conform.h
	src/lib/elm_cursor.h
	src/lib/elm_debug.h
	src/lib/elm_deprecated.h
	src/lib/elm_diskselector.c
	src/lib/elm_diskselector.h
	src/lib/elm_entry.c
	src/lib/elm_entry.h
	src/lib/elm_factory.c
	src/lib/elm_factory.h
	src/lib/elm_finger.h
	src/lib/elm_flip.c
	src/lib/elm_flip.h
	src/lib/elm_flipselector.c
	src/lib/elm_flipselector.h
	src/lib/elm_focus.h
	src/lib/elm_font.c
	src/lib/elm_frame.c
	src/lib/elm_frame.h
	src/lib/elm_gen.h
	src/lib/elm_gen_common.h
	src/lib/elm_general.h
	src/lib/elm_gengrid.c
	src/lib/elm_gengrid.h
	src/lib/elm_genlist.c
	src/lib/elm_genlist.h
	src/lib/elm_gesture_layer.c
	src/lib/elm_gesture_layer.h
	src/lib/elm_getting_started.h
	src/lib/elm_glview.c
	src/lib/elm_glview.h
	src/lib/elm_grid.c
	src/lib/elm_grid.h
	src/lib/elm_hover.c
	src/lib/elm_hover.h
	src/lib/elm_icon.c
	src/lib/elm_icon.h
	src/lib/elm_image.c
	src/lib/elm_image.h
	src/lib/elm_index.c
	src/lib/elm_index.h
	src/lib/elm_intro.h
	src/lib/elm_label.c
	src/lib/elm_label.h
	src/lib/elm_layout.c
	src/lib/elm_layout.h
	src/lib/elm_list.c
	src/lib/elm_list.h
	src/lib/elm_main.c
	src/lib/elm_map.c
	src/lib/elm_map.h
	src/lib/elm_mapbuf.c
	src/lib/elm_mapbuf.h
	src/lib/elm_menu.c
	src/lib/elm_menu.h
	src/lib/elm_mirroring.h
	src/lib/elm_need.h
	src/lib/elm_notify.c
	src/lib/elm_notify.h
	src/lib/elm_object.h
	src/lib/elm_object_item.h
	src/lib/elm_pager.c
	src/lib/elm_panel.h
	src/lib/elm_panes.c
	src/lib/elm_panes.h
	src/lib/elm_photo.c
	src/lib/elm_photo.h
	src/lib/elm_photocam.c
	src/lib/elm_photocam.h
	src/lib/elm_plug.c
	src/lib/elm_plug.h
	src/lib/elm_priv.h
	src/lib/elm_progressbar.h
	src/lib/elm_radio.c
	src/lib/elm_radio.h
	src/lib/elm_route.c
	src/lib/elm_route.h
	src/lib/elm_scale.h
	src/lib/elm_scroll.h
	src/lib/elm_scroller.c
	src/lib/elm_scroller.h
	src/lib/elm_segment_control.c
	src/lib/elm_segment_control.h
	src/lib/elm_slider.c
	src/lib/elm_slider.h
	src/lib/elm_slideshow.c
	src/lib/elm_slideshow.h
	src/lib/elm_spinner.c
	src/lib/elm_spinner.h
	src/lib/elm_store.c
	src/lib/elm_store.h
	src/lib/elm_table.h
	src/lib/elm_theme.c
	src/lib/elm_theme.h
	src/lib/elm_thumb.c
	src/lib/elm_thumb.h
	src/lib/elm_toolbar.c
	src/lib/elm_toolbar.h
	src/lib/elm_tooltip.h
	src/lib/elm_transit.c
	src/lib/elm_transit.h
	src/lib/elm_video.c
	src/lib/elm_video.h
	src/lib/elm_web.c
	src/lib/elm_web.h
	src/lib/elm_widget.c
	src/lib/elm_widget.h
	src/lib/elm_win.c
	src/lib/elm_win.h
	src/lib/els_cursor.c
	src/lib/els_icon.c
	src/lib/els_pan.c
	src/lib/els_scroller.c
	src/lib/els_tooltip.c
	src/modules/Makefile.am
	src/modules/access_output/Makefile.am
	src/modules/test_map/mod.c