adapted for new database structure - closes #10
changed through changes in the database structure

Conflicts:

	application/models/bill_model.php
changed year