Merge branch 'master' of ssh://slp-info.sec.samsung.net:29418/magnolia/apps/livebox...

Conflicts:
	com.samsung.data-provider-slave.rule

Change-Id: I61f61222b190fc988d4ebc3fba8e28fab7d9b262

diff --cc org.tizen.data-provider-slave.rule
index 153946a,0000000..25743c8
mode 100644,000000..100644
--- 1/org.tizen.data-provider-slave.rule
--- /dev/null
+++ b/org.tizen.data-provider-slave.rule
@@@ -1,27 -1,0 +1,28 @@@
- org.tizen.data-provider-slave data-provider-master rw
 +org.tizen.data-provider-slave app.default include
 +org.tizen.data-provider-slave device::app_logging w
 +org.tizen.data-provider-slave system::use_internet rw
 +org.tizen.data-provider-slave ail::db rw
 +org.tizen.data-provider-slave app-svc::db rw
 +org.tizen.data-provider-slave xorg rw
 +org.tizen.data-provider-slave isf rwx
 +org.tizen.data-provider-slave dbus wx
 +org.tizen.data-provider-slave data-provider-master::data rx
 +org.tizen.data-provider-slave data-provider-master::share rwxat
 +org.tizen.data-provider-slave data-provider-master::db rl
 +org.tizen.data-provider-slave data-provider-master::provider rw
 +org.tizen.data-provider-slave data-provider-master::utility rw
 +org.tizen.data-provider-slave e17 rx
 +org.tizen.data-provider-slave dali x
++org.tizen.app-tray org.tizen.data-provider-slave rx
 +dbus org.tizen.data-provider-slave rwx
 +org.tizen.data-provider-slave sound_server rw
 +org.tizen.data-provider-slave tts-server rwx
 +org.tizen.data-provider-slave aul::launch x
 +org.tizen.data-provider-slave security-server::api-cookie-check w
 +org.tizen.data-provider-slave ug-setting-call-efl::vconf r
 +org.tizen.data-provider-slave deviced::haptic rw
++org.tizen.data-provider-slave device::input r
 +
 +# Weather
 +org.tizen.data-provider-slave privacy-manager::read r
 +system::use_internet org.tizen.data-provider-slave rw

diff --cc src/main.c
Simple merge