Desktop changing of grid
Merge branch 'master' of github.com:sarrionandia/tournatrack

Conflicts:
	view/trackgrid.html