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

Conflicts:
	app/views/membergroups/index.html.haml
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
z
Merge branch 'master' of github.com:kantoliinary/kantoliina
poisto toimii
Merge branch 'master' of github.com:kantoliinary/kantoliina