Merge branch 'current_master' into courselecture
cleaned up log gout link using partial
Merge branch 'courselecture' into current_master

Conflicts:
	app/views/courses/show.html.erb
	app/views/courses/show_instructor.html.erb
	app/views/courses/show_student.html.erb
	app/views/courses/show_student.html.erb~HEAD_0
	app/views/users/show.html.erb