local changes
Merge branch 'master' of https://github.com/gumdrop/chilternquizleague

Conflicts:
	chilternquizleague/WebContent/competition/league-detail.html
	chilternquizleague/WebContent/js/maintain.js
Global application data