comment #8 - more work on the private/share invoice merge

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