Merge branch 'master' of https://github.com/quanyang/WASTE

Conflicts:
	QY-Ext/popup.js
check payloads again. got conflicts
123