new 8_6
Merge branch 'master' of https://github.com/shihweiyao/HY

Conflicts:
	app/controllers/invoices_controller.rb
Merge branch 'master' of https://github.com/shihweiyao/HY