Lobby 2.5

- Re-enable CPU Bench
Lobby 2.5

- Add Crotalus changes
Revert merge error, null the methods for now
Merge 'xinnony/2.5-fixes'

Conflicts:
	lua/ui/lobby/changelog.lua