Merge branch 'master' into sneks

Conflicts:
	SQL/paradise_schema.sql
	code/modules/client/preferences_mysql.dm

SQL/paradise_schema.sql

@@ -78,6 +78,7 @@ CREATE TABLE `characters` (
   `rlimb_data` mediumtext NOT NULL,
   `nanotrasen_relation` varchar(45) NOT NULL,
   `speciesprefs` int(1) NOT NULL,
+  `socks` mediumtext NOT NULL,
   `body_accessory` mediumtext NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=18747 DEFAULT CHARSET=utf8;