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

Conflicts:
	forum/cache/sql_021151d1a377d62dbfaa89a4d1acc716.php
	forum/cache/sql_b152bea2b86cc301f01da4d7125e73ba.php
	forum/cache/sql_efd26735c3bcbef398e23fb85e7ccd99.php