modify city into court
Merge remote-tracking branch 'tennis/master'

Conflicts:
	account/migrations/0001_initial.py