Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
Merge branch 'master' into staging
settings for debuggin all.js
move codemirror to its own bundle
Merge branch 'master' of github.com:hacklabr/timtec
make angular support statics from a different url
Merge branch 'master' into staging
pep8 and some configs that made broke tests
Merge branch 'master' into staging
dont call --all when syncing db
fixes js syntax problems and migration dependency
markdown directive for old admin
use new directive in old admin interface
Merge branch 'master' of github.com:hacklabr/timtec

Conflicts:
	administration/static/js/admin.js
	administration/templates/_base.html
put back the buttons to edit course texts
uses accounts.models.TimtecUser instead of get_user_model()