Merge branch 'devel/home/master'

Merge branch 'devel/home/master'

Conflicts:
	live.viewer/dbox.app/data/groups/tizen-dark-inc.edc
	live.viewer/packaging/com.samsung.w-add-viewer.spec
	live.viewer/viewer/po/CMakeLists.txt
	live.viewer/viewer/po/ar.po
	live.viewer/viewer/po/as.po
	live.viewer/viewer/po/az.po
	live.viewer/viewer/po/bg.po
	live.viewer/viewer/po/bn.po
	live.viewer/viewer/po/ca.po
	live.viewer/viewer/po/cs.po
	live.viewer/viewer/po/da.po
	live.viewer/viewer/po/de_DE.po
	live.viewer/viewer/po/el_GR.po
	live.viewer/viewer/po/en.po
	live.viewer/viewer/po/en_PH.po
	live.viewer/viewer/po/en_US.po
	live.viewer/viewer/po/es_ES.po
	live.viewer/viewer/po/es_MX.po
	live.viewer/viewer/po/et.po
	live.viewer/viewer/po/eu.po
	live.viewer/viewer/po/fa.po
	live.viewer/viewer/po/fi.po
	live.viewer/viewer/po/fil.po
	live.viewer/viewer/po/fr_CA.po
	live.viewer/viewer/po/fr_FR.po
	live.viewer/viewer/po/ga.po
	live.viewer/viewer/po/gl.po
	live.viewer/viewer/po/gu.po
	live.viewer/viewer/po/he.po
	live.viewer/viewer/po/hi.po
	live.viewer/viewer/po/hr.po
	live.viewer/viewer/po/hu.po
	live.viewer/viewer/po/hy.po
	live.viewer/viewer/po/id.po
	live.viewer/viewer/po/is.po
	live.viewer/viewer/po/it_IT.po
	live.viewer/viewer/po/ja_JP.po
	live.viewer/viewer/po/ka.po
	live.viewer/viewer/po/khmer.po
	live.viewer/viewer/po/kk.po
	live.viewer/viewer/po/kn.po
	live.viewer/viewer/po/ko_KR.po
	live.viewer/viewer/po/lo.po
	live.viewer/viewer/po/lt.po
	live.viewer/viewer/po/lv.po
	live.viewer/viewer/po/mk.po
	live.viewer/viewer/po/ml.po
	live.viewer/viewer/po/mr.po
	live.viewer/viewer/po/ms.po
	live.viewer/viewer/po/my.po
	live.viewer/viewer/po/nb.po
	live.viewer/viewer/po/ne.po
	live.viewer/viewer/po/nl_NL.po
	live.viewer/viewer/po/or.po
	live.viewer/viewer/po/pa.po
	live.viewer/viewer/po/pl.po
	live.viewer/viewer/po/pt_BR.po
	live.viewer/viewer/po/pt_PT.po
	live.viewer/viewer/po/ro.po
	live.viewer/viewer/po/ru_RU.po
	live.viewer/viewer/po/sinhala.po
	live.viewer/viewer/po/sk.po
	live.viewer/viewer/po/sl.po
	live.viewer/viewer/po/sq.po
	live.viewer/viewer/po/sr.po
	live.viewer/viewer/po/sv.po
	live.viewer/viewer/po/ta.po
	live.viewer/viewer/po/te.po
	live.viewer/viewer/po/th.po
	live.viewer/viewer/po/tr_TR.po
	live.viewer/viewer/po/uk.po
	live.viewer/viewer/po/update-po.sh
	live.viewer/viewer/po/ur.po
	live.viewer/viewer/po/uz.po
	live.viewer/viewer/po/vi.po
	live.viewer/viewer/po/zh_CN.po
	live.viewer/viewer/po/zh_HK.po
	live.viewer/viewer/po/zh_TW.po
	src/client.c
	src/dynamicbox_internal.c

Change-Id: Iff23ff1188920faf4bd4f3e1130eed4b4ba63b30