Merge branch 'Evevnt-and-Tags' of github.com:melk/itogo into Evevnt-and-Tags

Conflicts:
	db/schema.rb
Change DB
Roll back