Merges master with pull request branch

CHANGELOG

@@ -5,5 +5,9 @@
 * Huge speedup by caching ldap
 
 [0.1.2]
+<<<<<<< HEAD
 * Uses syncthing generated config
 * Bumps to version 0.14.28
+=======
+* Fixed wrong URL
+>>>>>>> 37b6969e241d42fce63138f87dfb344503708d53

CloudronManifest.json

@@ -21,7 +21,11 @@
     }
   },
   "manifestVersion": 1,
+<<<<<<< HEAD
   "website": "https://syncthing.net",
+=======
+  "website": "http://syncthing.net",
+>>>>>>> 37b6969e241d42fce63138f87dfb344503708d53
   "contactEmail": "support@cloudron.io",
   "icon": "logo.png",
   "tags": [