fix profile url reverse so user with @ in username
deactivate html5 editor to avoid conflict with course material files
Merge branch 'stable'

Conflicts:
	core/models.py
Merge branch 'master' into staging