Changed the path to correcter path
Merge branch 'feature-invoice' of https://github.com/Boxedsolutions/magento into feature-invoice

Conflicts:
	app/design/frontend/base/default/template/billmate/invoice.phtml
	app/design/frontend/base/default/template/billmate/partpayment/invoice.phtml