Merge branch 'dev'
"turn off the lights" for video viewing
Merge branch 'dev'

Conflicts:
	app/views/layouts/home.html.erb
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
fix course list display issues
Merge branch 'master' into dev