Merge branch 'timeline'
Pito's UI changes
UI & Navigation improvements
Merge branch 'master' into forum

Conflicts:
	app/views/courses/show_instructor.html.erb
	app/views/courses/show_student.html.erb
	app/views/lectures/show_instructor.html.erb
	db/schema.rb
some deletions