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

Conflicts:
	app/controllers/members_controller.rb
Haku formi
Merge branch 'master' of https://github.com/kantoliinary/kantoliina
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	app/views/members/index.html.haml
Merge branch 'master' of https://github.com/kantoliinary/kantoliina
utf-8 korjaus