Updated UI
Merge branch 'master' of https://github.com/jneighbs/newsfeed

Conflicts:
	db.sqlite3
	nf_server/templates/create_event.html
	nf_server/urls.py
	nf_server/views.py