unmerged changes
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-2013-Website into events

Conflicts:
	controlroom/views.py