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

Conflicts:
	app/views/members/invoice.html.haml
varmistus sivun poisto nappi