plane friends commit
Merge branch 'master' of https://github.com/misingnoglic/plane_match

Conflicts:
	match/templates/flight_users.html