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

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