In-progress updating of model.
Completed model update to improve performance and better handle connected users and judges.
Completed model update to improve performance and better handle connected users and judges.
Merge branch 'master' into devel

Conflicts:
	client/redacted.css