Merge branch 'master' into search-cid-uid

src/categories/create.js

@@ -32,7 +32,7 @@ module.exports = function(Categories) {
 				order: order,
 				link: '',
 				numRecentReplies: 1,
-				class: 'col-md-3 col-xs-6',
+				class: 'col-md-3 col-xs-12',
 				imageClass: 'auto'
 			};
 

src/emailer.js

@@ -62,7 +62,8 @@ var	fs = require('fs'),
 						plaintext: translated[1],
 						template: template,
 						uid: uid,
-						pid: params.pid
+						pid: params.pid,
+						fromUid: params.fromUid
 					});
 					callback();
 				} else {

src/views/partials/requirejs-config.tpl

@@ -0,0 +1,12 @@
+<script>
+	require.config({
+		baseUrl: "{relative_path}/src/modules",
+		waitSeconds: 3,
+		urlArgs: "{cache-buster}",
+		paths: {
+			'forum': '../forum',
+			'vendor': '../../vendor',
+			'mousetrap': '../../bower/mousetrap/mousetrap'
+		}
+	});
+</script>