Merge branch 'master' into simulator

Change-Id: I991a4d46eaa2cf073cdad357bc11b373971837be
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>

diff --cc service/SConscript
index 8bddead,75270d7..d6d8a5b
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript
@@@ -43,12 -43,7 +43,11 @@@ if target_os not in ['arduino','darwin'
                SConscript('notification-manager/SConscript')
  
        # Build resource-encapsulation project
-       if target_os not in ['android', 'tizen']:
-               SConscript('resource-encapsulation/SConscript')
+       SConscript('resource-encapsulation/SConscript')
 +
 +      # Build simulator module
 +      if target_os in ['linux']:
 +              SConscript('simulator/SConscript')
  #else:
  #     SConscript('notification-manager/SampleApp/arduino/SConscript')