Rename templates from html extenstion to djhtml extension, denoting that they're not pure HTML.
Merge branch 'master' into cities

Conflicts:
	beast/templates/workouts/calendar.djhtml