Finish the editing functionality, and add functionality to delete entries
Merge branch 'develop' of https://github.com/finnurtorfa/aflafrettir.com into develop

Conflicts:
	aflafrettir/views.py