fix nav_pages on SearchView
Add edinburgh council logo to ilwhack
add moment.js for hasacalendar
Remove all references Event model (replaced by asacalendar.com)
Merge branch 'master' of github.com:compsoc-edinburgh/website-django
Re-enable south. Disable south for captcha app.
Allow testing 404 pages in debug mode
Enable debugging of 404 page
Fixed 404 padding
add moment.js
Merge branch 'master' of github.com:compsoc-edinburgh/website-django
remove moment from requirements
Revert removal of Events model.

Reverts a6341dea50b92babd77ce03ef67df1280cdcb35b.
worked on setting dates of events
Merge branch 'master' of github.com:compsoc-edinburgh/website-django
ILWHack forms part 1
A bunch of ILWHack stuff
Merge branch 'ilwhack'

Conflicts:
	requirements.txt
Make bio optional