Merge pull request #75 from SmartThingsCommunity/master_rel_1_5_5

Master rel 1 5 5

Author: stdk-scm

apps/capability_sample/caps_button.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_button.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_colorControl.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_colorControl.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_dishwasherOperatingState.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_dishwasherOperatingState.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_dryerOperatingState.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_dryerOperatingState.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_execute.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_execute.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_gasMeter.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_gasMeter.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_mediaInputSource.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_mediaInputSource.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_mediaPlayback.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_mediaPlayback.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_objectDetection.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_objectDetection.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {

apps/capability_sample/caps_ovenOperatingState.h

@@ -17,7 +17,7 @@
  ****************************************************************************/
 
 #include "caps/iot_caps_helper_ovenOperatingState.h"
-#include "JSON.h"
+#include "external/JSON.h"
 
 #ifdef __cplusplus
 extern "C" {