new 7/29_2
Merge branch 'master' of https://github.com/shihweiyao/HY

Conflicts:
	app/controllers/invoices_controller.rb