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

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

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

Conflicts:
	app/views/invoice/edit.html.haml
Merge branch 'master' of github.com:kantoliinary/kantoliina
Djoo
Merge branch 'master' of github.com:kantoliinary/kantoliina
testaja