Refactored bill property names
Merge branch 'dev'

Conflicts:
	app/models/bill.rb