Merge remote-tracking branch 'tizen_2.4/tizen_2.4' into tizen

Conflicts:
	CMakeLists.sub
	CMakeLists.txt
	include/app_tracker.h
	include/flat_navi.h
	include/keyboard_tracker.h
	include/logger.h
	include/pivot_chooser.h
	include/screen_reader.h
	include/screen_reader_spi.h
	include/screen_reader_system.h
	include/screen_reader_tts.h
	include/screen_reader_vconf.h
	org.tizen.screen-reader.manifest
	org.tizen.screen-reader.xml
	packaging/org.tizen.screen-reader.spec
	res/icons/screen-reader.png
	src/app_tracker.c
	src/flat_navi.c
	src/keyboard_tracker.c
	src/main.c
	src/navigator.c
	src/pivot_chooser.c
	src/screen_reader.c
	src/screen_reader_spi.c
	src/screen_reader_tts.c
	src/screen_reader_vconf.c
	src/window_tracker.c
	tests/CMakeLists.sub
	tests/CMakeLists.txt
	tests/atspi/atspi.c
	tests/atspi/atspi.h

Change-Id: Ie2b273fdf4263505108c188f925bc723f5fc66f7

diff --cc CMakeLists.sub
index 7c5d679,eab1e8b..eab1e8b
mode 100644,100755..100644
--- 1/CMakeLists.sub
--- 2/CMakeLists.sub
+++ b/CMakeLists.sub

diff --cc CMakeLists.txt
index ee3c8d4,13155e7..13155e7
mode 100644,100755..100644
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt

diff --cc org.tizen.screen-reader.xml
index 79ae68d,46a1d28..46a1d28
mode 100644,100755..100644
--- 1/org.tizen.screen-reader.xml
--- 2/org.tizen.screen-reader.xml
+++ b/org.tizen.screen-reader.xml

diff --cc packaging/org.tizen.screen-reader.spec
index 05df328,251d721..251d721
mode 100644,100755..100644
--- 1/packaging/org.tizen.screen-reader.spec
--- 2/packaging/org.tizen.screen-reader.spec
+++ b/packaging/org.tizen.screen-reader.spec

diff --cc tests/CMakeLists.sub
index 47fcac2,249e698..249e698
mode 100644,100755..100644
--- 1/tests/CMakeLists.sub
--- 2/tests/CMakeLists.sub
+++ b/tests/CMakeLists.sub