Merge branch 'master' into tizen_2.1

Conflicts:
	common/data/edj_image_list/M01_icon_OTA.png
	common/data/edj_image_list/M01_icon_Push.png
	common/data/edj_image_list/M01_icon_broadcasting.png
	common/data/edj_image_list/M01_icon_message_status_mms_read_n.png
	common/data/edj_image_list/M01_icon_message_status_mms_sent_n.png
	common/data/edj_image_list/M01_icon_message_status_mms_unread_n.png
	common/data/edj_image_list/M01_icon_message_status_sms_read_n.png
	common/data/edj_image_list/M01_icon_message_status_sms_sent_n.png
	common/data/edj_image_list/M01_icon_message_status_sms_unread_n.png
	common/data/edj_image_list/M01_title_icon_compose.png
	common/data/edj_image_list/M01_title_icon_search.png
	common/data/msg_common.edc
	common/data/msg_images.edc
	common/msg-ui-bundle.h
	common/msg-ui-common-utility.c
	common/msg-ui-image-resource.h
	common/msg-ui-util.h
	composer/include/msg-ui-composer-common.h
	composer/include/msg-ui-composer-data.h
	composer/src/gadget/msg-ui-composer-gadget.c
	composer/src/ui-composer/msg-ui-composer-body-callback.c
	composer/src/ui-composer/msg-ui-composer-common.c
	composer/src/ui-composer/msg-ui-composer-main.c
	composer/src/ui-composer/msg-ui-composer-recipient-callback.c
	composer/src/ui-composer/msg-ui-composer-recipient.c
	main/CMakeLists.txt
	main/message.c
	main/message.h
	main/po/ar.po
	main/po/az.po
	main/po/bg.po
	main/po/ca.po
	main/po/cs.po
	main/po/da.po
	main/po/de_DE.po
	main/po/el_GR.po
	main/po/en.po
	main/po/en_PH.po
	main/po/en_US.po
	main/po/es_ES.po
	main/po/es_MX.po
	main/po/et.po
	main/po/eu.po
	main/po/fi.po
	main/po/fr_CA.po
	main/po/fr_FR.po
	main/po/ga.po
	main/po/gl.po
	main/po/hi.po
	main/po/hr.po
	main/po/hu.po
	main/po/hy.po
	main/po/is.po
	main/po/it_IT.po
	main/po/ja_JP.po
	main/po/ka.po
	main/po/kk.po
	main/po/ko_KR.po
	main/po/lt.po
	main/po/lv.po
	main/po/mk.po
	main/po/nb.po
	main/po/nl_NL.po
	main/po/pl.po
	main/po/pt_BR.po
	main/po/pt_PT.po
	main/po/ro.po
	main/po/ru_RU.po
	main/po/sk.po
	main/po/sl.po
	main/po/sr.po
	main/po/sv.po
	main/po/tr_TR.po
	main/po/uk.po
	main/po/uz.po
	main/po/zh_CN.po
	main/po/zh_HK.po
	main/po/zh_SG.po
	main/po/zh_TW.po
	packaging/org.tizen.message.spec
	setting/include/msg-ui-setting-common-util.h
	setting/include/msg-ui-setting-types.h
	setting/src/main/msg-ui-setting-common-util.c
	setting/src/main/msg-ui-setting-main.c
	setting/src/spam/msg-ui-setting-spam-block-number.c
	setting/src/spam/msg-ui-setting-spam-block-word.c
	setting/src/spam/msg-ui-setting-spam-setting.c
	setting/src/text/msg-ui-setting-text-message.c
	setting/src/text/msg-ui-setting-text-service-center.c
	thread/include/msg-ui-thread-main.h
	thread/src/msg-ui-thread-callback.c
	thread/src/msg-ui-thread-list.c
	thread/src/msg-ui-thread-main.c
	thread/src/msg-ui-thread-util.c
	thread/theme/thread_genlist.edc
	viewer/CMakeLists.txt
	viewer/include/msg-ui-viewer-play-view.h
	viewer/include/msg-ui-viewer-utility.h
	viewer/smil-player/include/msg-smil-event-manager.h
	viewer/smil-player/include/msg-smil-player-interface.h
	viewer/smil-player/include/msg-smil-player.h
	viewer/smil-player/include/msg-smil-render.h
	viewer/smil-player/include/msg-smil-types.h
	viewer/smil-player/src/msg-smil-content-manager.c
	viewer/smil-player/src/msg-smil-event-manager.c
	viewer/smil-player/src/msg-smil-media-render.c
	viewer/smil-player/src/msg-smil-player-interface.c
	viewer/smil-player/src/msg-smil-player.c
	viewer/smil-player/src/msg-smil-render.c
	viewer/src/msg-ui-viewer-callback.c
	viewer/src/msg-ui-viewer-drm-list.c
	viewer/src/msg-ui-viewer-gadget.c
	viewer/src/msg-ui-viewer-main.c
	viewer/src/msg-ui-viewer-utility.c
	viewer/theme/msg_viewer.edc

> Conflicts are fixed.

Change-Id: I1e7efd1759806385ea723fb97642fd1993862188

diff --cc common/data/edj_image_list/M01_icon_OTA.png
index 6143020,1e16d04..1e16d04
mode 100755,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_Push.png
index f130891,42a655d..42a655d
mode 100755,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_broadcasting.png
index 5ffd70a,acc346e..acc346e
mode 100755,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_message_status_mms_read_n.png
index ecc0f25,65613f9..65613f9
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_message_status_mms_sent_n.png
index 672c78b,3e4ef2d..3e4ef2d
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_message_status_mms_unread_n.png
index fc52b49,34bc154..34bc154
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_message_status_sms_read_n.png
index 91222e5,cb9a68d..cb9a68d
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_message_status_sms_sent_n.png
index 4e83758,2a4bebf..2a4bebf
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_icon_message_status_sms_unread_n.png
index d622de8,6e3a844..6e3a844
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_title_icon_compose.png
index 6c90e8c,aab7dc8..aab7dc8
mode 100644,100644..100755
Binary files differ

diff --cc common/data/edj_image_list/M01_title_icon_search.png
index cf8f197,be56ef3..be56ef3
mode 100644,100644..100755
Binary files differ

diff --cc viewer/smil-player/include/msg-smil-event-manager.h
Simple merge