User can tag their content

Signed-off-by: Alan Gardner <alan@armoin.com>
Merge branch 'tagging'