Merge branch 'master' into tizen_2.0

Change-Id: I21916f27e35107fba750034fbd6745e9880d4a44

diff --combined packaging/org.tizen.lockscreen.spec
index 3e0f039,1681831..25d7f47
--- 1/packaging/org.tizen.lockscreen.spec
--- 2/packaging/org.tizen.lockscreen.spec
+++ b/packaging/org.tizen.lockscreen.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:       org.tizen.lockscreen
  Summary:    lockscreen application
 -Version: 0.1.6
 +Version:    0.1.6
  Release:    1
  Group:      TBD
  License:    Apache
@@@ -35,7 -35,7 +35,7 @@@ make %{?jobs:-j%jobs
  %make_install
  mkdir -p %{buildroot}/usr/apps/org.tizen.lockscreen/data
  mkdir -p %{buildroot}/usr/share/license
- install -m 0755 LICENSE %{buildroot}/usr/share/license/org.tizen.lockscreen
+ install -m 0755 LICENSE.Flora %{buildroot}/usr/share/license/org.tizen.lockscreen
  
  %post
  /sbin/ldconfig