tags mostly; ajax almost complete.
ajax tags complete.
Merge remote-tracking branch 'remotes/origin/master' into gui

Conflicts:
	app/models/tag.scala
	app/views/slot/view.scala.html
merge conflicts