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

Conflicts:
	web/kimiss/views/Packer.js
	web/kimiss/views/index/IndexList.js
eric-cai
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/c/view/list/GroupedList.js
	web/kimiss/views/pinpai/PinpaiBody.js
Merge remote-tracking branch 'origin/master'