Merge remote-tracking branch 'origin' into notifications

public/src/app.js

@@ -41,7 +41,7 @@ var socket,
 					app.alert({
 						alert_id: 'connection_alert',
 						title: 'Connected',
-						message: 'Connection successfull',
+						message: 'Connection successful',
 						type: 'success',
 						timeout: 5000
 					});

src/webserver.js

@@ -116,7 +116,7 @@ var express = require('express'),
 			case 'home' :
 					categories.getAllCategories(function(data) {
 						data.motd_class = (config.show_motd || config.show_motd === undefined) ? '' : 'none';
-						data.motd = marked(config.motd || "# NodeBB v0.1\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i> Get NodeBB</a> <a target=\"_blank\" href=\"https://github.com/psychobunny/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i> Fork us on Github</a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i> @dcplabs</a>");
+						data.motd = marked(config.motd || "# NodeBB v0.1\nWelcome to NodeBB, the discussion platform of the future.\n\n<a target=\"_blank\" href=\"http://www.nodebb.org\" class=\"btn btn-large\"><i class=\"icon-comment\"></i> Get NodeBB</a> <a target=\"_blank\" href=\"https://github.com/designcreateplay/NodeBB\" class=\"btn btn-large\"><i class=\"icon-github-alt\"></i> Fork us on Github</a> <a target=\"_blank\" href=\"https://twitter.com/dcplabs\" class=\"btn btn-large\"><i class=\"icon-twitter\"></i> @dcplabs</a>");
 						res.send(JSON.stringify(data));
 					}, (req.user) ? req.user.uid : 0);
 				break;