whitelisted restore
Merge branch 'master' of github.com:jongman/algospot into prod

Conflicts:
	www/judge/tasks.py
PACKINg
Merge branch 'master' of github.com:jongman/algospot into prod