adapted for new database structure - closes #10
general changes
Merge branch 'develop'

Conflicts:
	application/models/bill_model.php