Bill collections now only hold bill basic info
Merge branch 'dev'