new 11_18
Merge branch 'master' of https://github.com/shihweiyao/HY

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