defining areas for site tour
fix layout and files for all steps
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 site-tour

Conflicts:
	themes/default/templates/course.html