Merge branch 'file' into invoice
Merge branch 'develop' into invoice
comments #8 - files for edit invoice

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'invoice' into develop