added u functionality
watMerge branch 'master' of https://github.com/UCSD-TIES/ckprosecution

Conflicts:
	reports/views.py
asdf`Merge branch 'master' of https://github.com/UCSD-TIES/ckprosecution

Conflicts:
	reports/views.py