Order dances alphabetically
Order organisations alphabetically
Refactor dance order test to improve readability
Merge branch 'master' into event

Conflicts:
	test/models/organisation_test.rb