Merge branch 'master' into tizen_2.1

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
	filesystem/etc/profile.d/sensord_setting.sh
	filesystem/usr/lib/systemd/system/emul-legacy-start.service
	packaging/system-plugin-emulator.spec

Change-Id: I70792cc2a08c5cd6d710d007167ed37e2afa26c3

diff --cc packaging/system-plugin-emulator.spec
index aa1341b,36232cb..c6cc5b1
--- 1/packaging/system-plugin-emulator.spec
--- 2/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@@ -1,7 -1,10 +1,10 @@@
- Summary: System plugin for emulator
  Name: system-plugin-emulator
- Version: 0.0.3
 -Version: 0.0.5
++Version: 0.0.6
  Release: 1
+ 
+ %define systemd_dir     /usr/lib/systemd
+ 
+ Summary: System plugin for emulator
  License: Apache-2.0
  Group: System/Base
  Requires: udev