COMMIT! :D:D:D:D
Merge remote-tracking branch 'origin/master'

Conflicts:
	tickets/views.py
COMMIT! :D:D:D:D