Remember to check for room persmission for tournaments as well
Change to a more JSON-type update format
Merge remote-tracking branch 'upstream/master' into tournaments
Merge branch 'tournaments' into tournaments-frontend

Conflicts:
	rooms.js
Fix ghost user bug
Try to fix tournaments breaking on hotpatch
Rename Tournaments.getTournament -> Tournaments.get
Prevent double starting of a tournament
Return a room ID in the tournament list rather than the no longer existing name
Fix users being able to be disqualified  multiple times
Change room.send() -> room.add() for most messages in tournaments
Fix crash in tournaments when a non-participant attempts to challenge someone
Only send tournament updates when required
Also send a tournament update after renaming
Report challenging as a match status
Fix crash in tournaments
Fix subtle bug in sending format during tournament creation

where the format name is sent rather than the ID
Merge remote-tracking branch 'upstream/master' into tournaments-frontend

Conflicts:
	package.json
Update tournaments frontend with new async User.prepBattle
Fix the fix