Merge branch 'master' into dev

Author: nanoninja

Diff for: .gitignore

@@ -19,4 +19,7 @@ data/
 nbproject/
 /nbproject/
 /nbproject/private/
-/nbproject/private/private.properties
+/nbproject/private/private.properties
+
+# SSL Certs
+etc/ssl/

Diff for: doc/configure-cacert-for-local.md

@@ -0,0 +1,26 @@
+# Configure Local CA CERT with MacOS
+
+## 1. The warning you receive while developing locally.
+
+![Warning](images/cacert-1-warning.png)
+
+## 2. Open the keychain app.
+
+![Open Keychain](images/cacert-2-open-keychain.png)
+
+## 3. Use File --> Import to add the ca cert you've already created.
+
+![Add CA Cert](images/cacert-3-add-cacert-file-import.png)
+
+## 4. Once added, locate it via the search box.
+
+![Localhost Search Box](images/cacert-4-locate-cert.png)
+
+## 5. Set to always trust.
+
+![Trust The Cert](images/cacert-5-set-to-always-trust.png)
+
+## 6. Reload the webpage.
+
+![The Results](images/cacert-6-reload-page.png)
+