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

Conflicts:
	doc/ActiveSupport.html
	doc/ActiveSupport/TestCase.html
	doc/Admin.html
	doc/AdminTest.html
	doc/AdminsController.html
	doc/ApplicationController.html
	doc/ApplicationHelper.html
	doc/Billing.html
	doc/BrowsingTest.html
	doc/CreateAdmins.html
	doc/Gemfile.html
	doc/HtmlSelectorsHelpers.html
	doc/Kantoliina.html
	doc/Kantoliina/Application.html
	doc/Member.html
	doc/Membergroup.html
	doc/MembersController.html
	doc/NavigationHelpers.html
	doc/Object.html
	doc/README_rdoc.html
	doc/Rakefile.html
	doc/WithinHelpers.html
	doc/index.html
lisää/edit jäsen sivun fixsaus
Merge branch 'master' of github.com:kantoliinary/kantoliina