Added more advanced billing reporting for sysadmin
Merge branch 'master' of github.com:ciniki/ciniki