Update siteData_simple.js

baidu https
Update siteData_my.js

baidu https
4.2.1.4 wen.lu 改为 awk.so ，百度改为 https
[RULE] Add extra sub domain and `contentReplace`.
4.2.1.4 更改射手字幕为 subom.net
trakt.tv 链接改为 yyxz
移除无效规则
0.0.3 稍微修正
4.8.9 新增 scrollAnimate 设置，booklineMe 繁体的支持，新增修正站点 zashu.net、shuhaha.com，一些规则修正
Merge branch 'master' of https://github.com/JixunMoe/userscript into JixunMoe-master

Conflicts:
	MyNovelReader/src/rule.js
Merge branch 'JixunMoe-master'
Merge pull request #26 from renyouguo/patch-3

Update siteData_my.js
Merge pull request #25 from renyouguo/patch-2

Update siteData_simple.js
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