Fix #553
Fix #561
Fix #542
Merge remote-tracking branch 'origin/development' into development
Fix #509
Invoice email table