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

Conflicts:
	app/controllers/invoice_controller.rb