Merge branch 'develop' into invoice
invoice time combine fix

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

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