Merge remote-tracking branch 'upstream/master' into bay_equipping

Conflicts:
	code/modules/client/preference/preferences.dm
	icons/mob/uniform.dmi

SQL/paradise_schema.sql

@@ -249,6 +249,7 @@ CREATE TABLE `player` (
   `volume` smallint(4) DEFAULT '100',
   `nanoui_fancy` smallint(4) DEFAULT '1',
   `show_ghostitem_attack` smallint(4) DEFAULT '1',
+  `lastchangelog` varchar(32) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `ckey` (`ckey`)
 ) ENGINE=InnoDB AUTO_INCREMENT=32446 DEFAULT CHARSET=latin1;