Merge branch 'develop' of github.com:jgen/shimmie2 into linting

Manually resolved conflicts:
	ext/chatbox/js/yshout.js

ext/chatbox/js/yshout.js

@@ -376,12 +376,13 @@ YShout.prototype = {
 		if (!$.browser.safari) {return;}
 		
 		var same = [];
+
 		for (var i = 0; i < this.p.length; i++) {
 			if (this.p[i].adminInfo.ip === ip) {
 				same.push(this.p[i]);
 			}
 		}
-
+		
 		for (var j = 0; j < same.length; j++) {
 			$('#' + same[j].id).fadeTo(this.animSpeed, 0.8).fadeTo(this.animSpeed, 1);
 		}