Work on playmats and match layout and positioning.
Merge branch 'match_progress'

Conflicts:
	site/snippets/header.php
All up to date now.