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

Conflicts:
	app/views/invoices/index.html.erb