add update demo
demo settings_local
fix update-demo
fix update-demo
fix settings_local
merge
merge
set a default STATIC_ROOT.

Fixes #488
fix add activity layout on lesson page
fix video aspect on admin, fixes #494 login prompt
Merge branch 'master' into demo
fix unit navigation on small screens
quick fix to remove introjs stuff that leaked in
how did that even work
it should never be reseting the database/media
fixes #499
emails might work now
merge
there is no comments in makefile macros
refactoring less sctructure