Merge branch 'master' of https://github.com/Wafflewrath/lo18_utsh

Conflicts:
	forum/cache/data_bots.php
	forum/cache/data_global.php
	forum/cache/data_hooks.php
	forum/cache/sql_9dc91161799801b44926b824ccc5cf51.php