Edited event views
Fixed profile bugs
Merge branch 'master' of https://github.com/shannontan94/tbpsite

Conflicts:
	tbpsite/urls.py