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

Conflicts:
	app/controllers/partners_controller.rb
	app/views/partners/check_membership.html.haml
	config/routes.rb