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

Conflicts:
	app/views/invoices/_form_place.html.erb
	app/views/invoices/_form_send.html.erb
	app/views/invoices/show.html.erb