fixing tags
Merge branch 'master' of github.com:a-plus-plus/aktivator

Conflicts:
	db/seeds.rb