Merge remote-tracking branch 'origin/master'

Conflicts:
	match/templates/flight_users.html
	match/templates/friend_profile.html
	match/views.py