Merge branch 'master' into windows-port

Change-Id: Iea39b951591a8f6a72285cf457b83f9c96e2e772
Signed-off-by: David Antler <david.a.antler@intel.com>

diff --cc SConstruct
Simple merge

diff --cc resource/csdk/connectivity/src/adapter_util/caadapternetdtls.c
Simple merge

diff --cc resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_eth.cpp
Simple merge

diff --cc resource/csdk/connectivity/src/ip_adapter/arduino/caipserver_wifi.cpp
Simple merge

diff --cc resource/csdk/connectivity/src/ip_adapter/caipserver.c
Simple merge

diff --cc resource/csdk/logger/SConscript
index 68a5b89,40c60bb..cb82de4
--- 1/resource/csdk/logger/SConscript
--- 2/resource/csdk/logger/SConscript
+++ b/resource/csdk/logger/SConscript
@@@ -1,8 -1,9 +1,10 @@@
  Import('env')
  import os
  
 -env.AppendUnique(CPPPATH = [os.path.join(Dir('.').abspath, './include')])
 +env.AppendUnique(CPPPATH = [os.path.join(Dir('.').abspath, 'include')])
 +
+ if env.get('TARGET_OS') in ['arduino']:
+       env.AppendUnique(CPPPATH = [os.path.join(env.get('BUILD_DIR'), 'resource/c_common/oic_string/include')])
  if env.get('TARGET_OS') == 'tizen':
        env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
  else:

diff --cc resource/csdk/logger/src/logger.c
Simple merge

diff --cc resource/csdk/stack/include/ocpayload.h
index 45a91d4,4b62813..40f85d7
mode 100755,100644..100644
--- 1/resource/csdk/stack/include/ocpayload.h
--- 2/resource/csdk/stack/include/ocpayload.h
+++ b/resource/csdk/stack/include/ocpayload.h

diff --cc resource/csdk/stack/include/octypes.h
Simple merge

diff --cc resource/csdk/stack/src/ocpayload.c
index 72b0ffe,2ad55b2..78494a4
mode 100755,100644..100644
--- 1/resource/csdk/stack/src/ocpayload.c
--- 2/resource/csdk/stack/src/ocpayload.c
+++ b/resource/csdk/stack/src/ocpayload.c

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

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

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

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

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

diff --cc resource/examples/SConscript
Simple merge