removed unneeded imports
Merge remote-tracking branch 'origin/master'

Conflicts:
	evaluation/views.py
Merge remote-tracking branch 'origin/master'
complete versioning now supported