new format for sql backup
Merge branch 'master' into staging

Conflicts:
	Makefile
Merge branch 'master' into staging
fix profile url reverse so user with @ in username
Merge branch 'master' into staging
Merge branch 'master' into staging
deactivate html5 editor to avoid conflict with course material files
Merge branch 'master' into staging
Merge branches 'staging' and 'master' of github.com:hacklabr/timtec
Merge branch 'stable'

Conflicts:
	core/models.py
fixes #215
show login for non enrolled users when they click on units
Merge remote-tracking branch 'origin/master' into admin

Conflicts:
	core/templates/course.html