Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sqlfix

# Conflicts:
#	SQL/paradise_schema.sql
#	SQL/paradise_schema_prefixed.sql

SQL/updates/6-7.sql

@@ -0,0 +1,2 @@
+ALTER TABLE player
+MODIFY COLUMN toggles int;

SQL/updates/7-8.sql

@@ -0,0 +1,2 @@
+# Add afk_watch which gives users the option to make use of the AFK watcher subsystem
+ALTER TABLE `player` ADD `afk_watch` tinyint(1) NOT NULL DEFAULT '0';