aakkosia lisatty
Merge branch 'master' of github.com:kantoliinary/kantoliina
aakkosia
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	spec/controllers/member_controller_spec.rb