Merge branch 'espruino:master' into master

apps/imgclock/metadata.json

@@ -3,7 +3,7 @@
   "name": "Image background clock",
   "shortName": "Image Clock",
   "version": "0.11",
-  "description": "A clock with an image as a background",
+  "description": "A clock with an image as a background. **Note:** this clock shows seconds, so has higher than average power consumption.",
   "icon": "app.png",
   "type": "clock",
   "tags": "clock",

apps/lint_exemptions.js

@@ -1469,5 +1469,11 @@ module.exports = {
       "no-unused-vars",
       "no-cond-assign"
     ]
+  },
+  "kineticscroll/boot.min.js": {
+    "hash": "a5106fa601cdbd2179e32265a8b77e2df62ba44ca0f4b94ce1e594c95a47e20d",
+    "rules": [
+      "no-cond-assign"
+    ]
   }
 };