whoopsie, grappelli is back
Merge branch 'refs/heads/master' into strava-integration

Conflicts:
	fitcompetition/settings.py