lee
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/machine/machine_html/043-1_S_product_List1_machine.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	views/machine/machine_html/043-1_S_product_List1_machine.html