eric-cai
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/kimiss/views/product/ProList.js