create a proper test of collecstatic
fix add activity layout on lesson page
fix video aspect on admin, fixes #494 login prompt
Merge branch 'master' into demo