Merge branch 'Evevnt-and-Tags'

Conflicts:
db/schema.rb