Dashboard and Event views improvements 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Organiser/Organiser/urls.py