Merge "Merge Resource Directory into the master"

diff --cc resource/csdk/stack/src/ocresource.c
Simple merge

diff --cc resource/docs/Doxyfile
index 4507b96,cf72346..08ad486
--- 1/resource/docs/Doxyfile
--- 2/resource/docs/Doxyfile
+++ b/resource/docs/Doxyfile
@@@ -670,8 -670,11 +670,9 @@@ INPUT                  = . 
                           ../csdk/stack/include/ocstackconfig.h \
                           guides \
                           ../../service/things-manager/sdk/inc \
 -                         ../../service/soft-sensor-manager/SDK/cpp/include \
 -                         ../../service/protocol-plugin/plugin-manager/src/PluginManager.h \
 -                         ../../service/notification-manager/NotificationManager/include/hosting.h \
 +                         ../../service/resource-hosting/include/hosting.h \
                           ../../service/resource-encapsulation/include \
+                          ../../service/resource-directory/include \
  
  # This tag can be used to specify the character encoding of the source files
  # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --cc service/SConscript
Simple merge