Merge branch 'master' into resource-encapsulation

Update the changes of master branch into resource-encapsulation branch.

Change-Id: Ie553d5813809f0f7d686e074b95ff330eb82bc88
Signed-off-by: hunje.yeon <hunje.yeon@samsung.com>

diff --cc service/SConscript
index be14359,be349be..d32d608
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript
@@@ -40,9 -40,8 +40,9 @@@ if target_os not in ['arduino','darwin'
  
        # Build notification manager project
        SConscript('notification-manager/SConscript')
- 
+       
        # Build resource-encapsulation project
 -      if target_os not in ['tizen']:
 -              SConscript('resource-encapsulation/SConscript')
 +      SConscript('resource-encapsulation/SConscript')
 +#else:
 +#     SConscript('notification-manager/SampleApp/arduino/SConscript')