4.2.1.4 wen.lu 改为 awk.so ，百度改为 https
Merge branch 'baidu-https' of https://github.com/Firef0x/UserScripts into Firef0x-baidu-https

Conflicts:
	searchEngineJumpCE/searchEngineJumpCE.user.js
Merge branch 'Firef0x-baidu-https'
Merge branch 'master' of github.com:ywzhaiqi/userscript

Conflicts:
	searchEngineJumpCE/src/res/siteData_my.js
	searchEngineJumpCE/src/res/siteData_simple.js