AddingQueryFinished
Merge branch 'dev' of https://github.com/bwbecker/oat into dev

Conflicts:
	app/assets/stylesheets/main.less
	app/models/persist/tables/OatTag.scala
	app/models/persist/tables/OatTagContent.scala
Fix bug in searching userids with 2 alpha characters before digits.