* master: (47 commits)
  feat: Bilibii 关注专栏 (DIYgod#2260)
  feat: WIRED杂志根据标签订阅 (DIYgod#2262)
  docs: fix typo
  fix: douban movie
  feat: remove weibo/user2, close DIYgod#2169
  fix: notch time (DIYgod#2259)
  fix: 鼠绘无法获取最新漫画bug (DIYgod#2257)
  feat: 增加 Hacker News 内容 (DIYgod#2253)
  feat: 添加了移动支付网分类 (DIYgod#2247)
  docs: 好奇怪文档示例错误 (DIYgod#2255)
  feat: 增加好奇怪 - 好奇心日报荣誉出品 (DIYgod#2252)
  feat: 添加新浪专栏-创事记 (DIYgod#2251)
  feat:添加cnBeta最新文章 (DIYgod#2249)
  docs: format
  docs: update qa
  fix: 小黑盒热门折扣 (DIYgod#2237)
  docs: update aqicn.org 文档说明 (DIYgod#2240)
  fix: fix saraba1st docs (DIYgod#2238)
  feat: 增加猫眼电影 (DIYgod#2234)
  fix: 修复 语雀知识库link 404报错 (DIYgod#2230)
  ...

# Conflicts:
#	lib/routes/twitter/user.js