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

Conflicts:
	web/kimiss/views/Packer.js
	web/kimiss/views/pinpai/Pinpai.js