Simpler sign up + Challenge creation in ADMIN tab
Merge remote-tracking branch 'origin/master'

Conflicts:
	db_model.pyc
	forms.pyc
Merge remote-tracking branch 'origin/master'