fixes #8394 , add billing management.
Merge branch 'develop' of github.com:NETivism/netiCRM into develop