# This is a combination of 2 commits.
# The first commit's message is:

Data model changes

# The 2nd commit message will be skipped:

#	fixup
Data migration to add Boston as a city and set it as everyone's primary city.
Data integrity change, don't delete UserProfile or Workout if a city is deleted.
Show the current city in the navbar and add a dropdown to allow the user to change the city.
Add cities to admin
Put the city name in the Calendar menu item, and put the city name in a span.
Merge branch 'master' into cities
Only put workouts for the current city on the calendar.
Rename cities to alt_cities for clarity.
Merge branch 'master' into cities

Conflicts:
	beast/templates/workouts/calendar.djhtml
Modify the FAQ's explanation of the BEAST acronym.
Add cities to locations
Set the user's primary city during registration.
Let the user change their primary city and follow other cities via the My Account page
Remove city dropdown from topbar, add city name to the top of the calendar.
Add slug to City objects and make a /city/<slug> endpoint.
Add a City dropdown to the Workout creation form.
Fix error reporting on the account AJAX endpoint.
The AccountForm shouldn't require alternate cities.
Show a workout's city on the Account page.