Added a tags column to the contents table
Merge branch 'tags'