add/update fields of Job/Invoice/Payment model and fix csv download from admin
Migrate database
Conflicts resolved, branch merged