Changes to orders, moved sponsors up
Merge branch 'develop' of https://github.com/RoelandMatthijssens/lanparty into develop

Conflicts:
	app/views/compos/index.html.erb
	app/views/teams/_form.html.erb
	app/views/teams/index.html.erb