Added tags.html and migrations
Merge branch 'dev' into live
Added missing templates from dj