Update auto
Merge branch 'master' of https://github.com/laihuythinh/bill

Conflicts:
	home/controllers/invoice.cfc
	home/views/invoice/default.cfm