Manually merging pull request #337 from piepmatz/master

Conflicts:
	evap/evaluation/tools.py
	evap/results/templates/results_semester_detail.html
	evap/results/views.py