Version 2.1, Commit 11 or something
Merge remote-tracking branch 'origin/master'

Conflicts:
	WMTA/Events/DistrictRegistration.aspx