Merge branch 'master' into skysql_field

# Conflicts:
#	bookings/src/db.js
#	flights/src/db.js
#	orders/src/db.js
#	places/src/db.js

bookings/src/db.js

@@ -1,8 +1,12 @@
-const fs = require("fs");
 var mariadb = require('mariadb');
 require('dotenv').config();
 
-const serverCert = [fs.readFileSync("skysql_chain.pem", "utf8")]
+// SSL (e.g. SkySQL) connections 
+// * Remember to change the location of "skysql_chain.pem" to wherever you placed it!
+// * To use just uncomment the two lines below and the 'ssl' property (and value)
+
+const fs = require("fs");
+const serverCert = [fs.readFileSync("skysql_chain.pem", "utf8")];
 
 const pool = mariadb.createPool({
     host: process.env.DB_HOST, 

flights/src/db.js

@@ -1,7 +1,11 @@
-const fs = require("fs");
 var mariadb = require('mariadb');
 require('dotenv').config();
 
+// SSL (e.g. SkySQL) connections 
+// * Remember to change the location of "skysql_chain.pem" to wherever you placed it!
+// * To use just uncomment the two lines below and the 'ssl' property (and value)
+
+const fs = require("fs");
 const serverCert = [fs.readFileSync("skysql_chain.pem", "utf8")];
 
 const pool = mariadb.createPool({

orders/src/db.js

@@ -1,9 +1,12 @@
-const fs = require("fs");
 var mariadb = require('mariadb');
 require('dotenv').config();
 
-// For SSL connections
+// SSL (e.g. SkySQL) connections 
-const serverCert = [fs.readFileSync("skysql_chain.pem", "utf8")];
+// * Remember to change the location of "skysql_chain.pem" to wherever you placed it!
+// * To use just uncomment the two lines below and the 'ssl' property (and value)
+
+const fs = require("fs");
+const serverCert = [fs.readFileSync("skysql_chain.pem", "utf8")];r
 
 var pools = [
   mariadb.createPool({

places/src/db.js

@@ -1,8 +1,12 @@
-const fs = require("fs");
 var mariadb = require('mariadb');
 require('dotenv').config();
 
-const serverCert = [fs.readFileSync("skysql_chain_t.pem", "utf8")];
+// SSL (e.g. SkySQL) connections 
+// * Remember to change the location of "skysql_chain.pem" to wherever you placed it!
+// * To use just uncomment the two lines below and the 'ssl' property (and value)
+
+const fs = require("fs");
+const serverCert = [fs.readFileSync("skysql_chain.pem", "utf8")];
 
 const pool = mariadb.createPool({
   host: process.env.DB_HOST,