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

Conflicts:
	web/kimiss/views/pinpai/PinpaiBody.js
eric-cai
Merge remote-tracking branch 'origin/master'