commit code
Merge branch 'master' of https://github.com/luubaokiem/dashboard

Conflicts:
	model/beans/currency.cfc
	model/beans/customer.cfc
	model/beans/invoice.cfc
	views/customer/summary.cfm