A bunch of changes i do not remember
Merge branch 'master' of github.com:NSSatIITM/nss2k14

Conflicts:
	apps/events/models.py
	apps/events/views.py