Merge branch 'master' into notification-service

Add recent changes of master branch into notification-service
Exclude notification service from build,
because CA changes need to be applied both of provider and consumer.
It will be changed in next commit

Change-Id: Id9bb9391c648b76d811034b896a933f42de89328
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

diff --cc service/SConscript
index 45208fc,114be6e..e774d74
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript
@@@ -30,7 -30,7 +30,7 @@@ if target_os not in ['arduino','darwin'
      # Build things manager project
      SConscript('things-manager/SConscript')
  
--    # Build notification manager project
++    # Build resource-hosting project
      SConscript('resource-hosting/SConscript')
  
      # Build resource-encapsulation project
@@@ -43,9 -43,6 +43,10 @@@
      if target_os in ['linux']:
          SConscript('scene-manager/SConscript')
  
-     if target_os in ['linux','android']:
-         SConscript('notification/SConscript')
++    # Build notification-service project    
++    #if target_os in ['linux','android']:
++       # SConscript('notification/SConscript')
 +
      # Build simulator module
      if target_os in ['linux'] and env.get('SIMULATOR', False):
          SConscript('simulator/SConscript')