Merge branch 'master' into simulator

Change-Id: I76a7d8c501e2122a3c4eddd73ede9f7195fe1055
Signed-off-by: Harish Kumara Marappa <h.marappa@samsung.com>

diff --cc resource/include/OCApi.h
Simple merge

diff --cc resource/src/InProcServerWrapper.cpp
Simple merge

diff --cc service/SConscript
index d6d8a5b,be349be..9fb8020
--- 1/service/SConscript
--- 2/service/SConscript
+++ b/service/SConscript
@@@ -39,16 -39,9 +39,14 @@@ if target_os not in ['arduino','darwin'
                SConscript('protocol-plugin/SConscript')
  
        # Build notification manager project
-       if target_os not in ['android', 'tizen']:
-               SConscript('notification-manager/SConscript')
- 
+       SConscript('notification-manager/SConscript')
+       
        # Build resource-encapsulation project
-       SConscript('resource-encapsulation/SConscript')
+       if target_os not in ['tizen']:
+               SConscript('resource-encapsulation/SConscript')
  
- #else:
- #     SConscript('notification-manager/SampleApp/arduino/SConscript')
 +      # Build simulator module
 +      if target_os in ['linux']:
 +              SConscript('simulator/SConscript')
 +
 +