login -> username, groupname -> name
Merge branch 'master' of https://github.com/kantoliinary/kantoliina
testi korjaus
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	db/seeds.rb