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

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