Remove seeds
Merge branch 'dev' into Elch

Conflicts:
	db/seeds.rb
EMERGENCY merge with bug fixes and seeds