defining areas for site tour
fix layout and files for all steps
Merge branch 'master' into site-tour

Conflicts:
	themes/default/templates/course.html
Merge branch 'master' into test
Merge branch 'test' of github.com:hacklabr/timtec into test