VS for Dan
Merge branch 'development' of github.com:dan-westall/planetary-annihilation-tournament-manager into development

Conflicts:
	public/assets/js/matchlisting.js