1020
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/hy_cpc_print_close.js