TEMP
Merge branch 'master' of charon.fullaf.com:/git/nt_tickets

Conflicts:
	tickets/templates/email/confirm.html
	tickets/views.py