editointi formin muokkaus
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	app/views/members/edit.html.haml
	app/views/members/index.html.haml