Add basic tagging models.
Merge branch 'master' of github:databrary/play
Merge remote-tracking branch 'remotes/origin/master' into gui