FX-39: Fix bug
FX-40: Add order Number to Invoice
Merge remote-tracking branch 'origin/master' into module