WIP
ready for review
adding forgotten stuff
Merge branch 'master' into recap_page

Conflicts:
	otoreza/core/views.py
Merge pull request #9 from habfast/recap_page

Recap page