Print styles
Add new reports
Merge branch 'master' into rvkpp

Conflicts:
	boris/reporting/admin.py
Bring the existing tests uptodate.