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

Conflicts:
	app/controllers/invoice_controller.rb
membergroup kurkku
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/controllers/invoice_controller.rb
	app/controllers/reminder_controller.rb
	app/helpers/invoice_helper.rb