Merge branch 'master' of http://192.168.100.32:3000/longsanlang/Network-Modules

# Conflicts:
#	Drivers/CONFIG.h
#	Drivers/Modules/Tuoreniot.c
#	User/main.c

Drivers/.gitignore

@@ -0,0 +1 @@
+/CONFIG.h

RTE/RTE_Components.h

@@ -0,0 +1,15 @@
+
+/*
+ * Auto generated Run-Time-Environment Component Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'Project' 
+ * Target:  'Target 1' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+#define RTE_Security_mbedTLS            /* Security mbed TLS */
+
+#endif /* RTE_COMPONENTS_H */

User/.gitignore

@@ -0,0 +1 @@
+/main.c