Added UserTables, more logic to TournamentStatuses, etc.
Merge fixed