changed names for invoice and payment plan
Merge remote-tracking branch 'origin/develop' into develop