Merge remote-tracking branch 'origin/chat-route' into chat-route

How in the seven hells do I manage to conflict myself?

Conflicts:
	public/src/forum/chats.js
	public/src/modules/chat.js
	src/middleware/middleware.js

src/middleware/middleware.js

@@ -227,6 +227,8 @@ middleware.chat.getMessages = function(req, res, next) {
 	}
 };
 
+/* End Chat Middlewares */
+
 middleware.buildHeader = function(req, res, next) {
 	res.locals.renderHeader = true;
 	async.parallel({