Fixed event time bugs. Registration page now uses base template.
Merge branch 'master' into fingr-27

Conflicts:
	main/models.py
halfway done event markers