study/list.scala.html progress
study list; media tabs
Merge branch 'gui' into gui_temp

Conflicts:
	app/views/display.scala
media thumbs