added inactive status to payments, cleanup
Merge branch 'dev'