Aswesome
Merge branch 'master' of https://github.com/Prithvirajbilla/event

Conflicts:
	events/settings.py
Merge branch 'master' of https://github.com/Prithvirajbilla/event
server side changes