brach test
2.26
Merge branch 'develop'

Conflicts:
	project/challenge/models.py
	project/challenge/models.py~
	project/challenge/templates/challengingpre.html
	project/challenge/urls.py
	project/challenge/urls.py~
	project/challenge/views.py
	project/challenge/views.py~
	project/security_website/static/JS/challenge.js