Merge branch 'master' of https://github.com/NodeBB/NodeBB

Conflicts:
	package.json

package.json

@@ -48,7 +48,7 @@
     "nodebb-plugin-soundpack-default": "0.1.4",
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
-    "nodebb-theme-lavender": "2.0.11",
+    "nodebb-theme-lavender": "2.0.12",
     "nodebb-theme-persona": "4.0.2",
     "nodebb-theme-vanilla": "5.0.2",
     "nodebb-widget-essentials": "2.0.3",
@@ -67,7 +67,7 @@
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "0.2.16",
+    "templates.js": "0.3.0",
     "uglify-js": "^2.4.24",
     "underscore": "~1.8.3",
     "underscore.deep": "^0.5.1",