Merge branch 'master' into develop

* master:
  理清异常捕获
Merge branch 'develop' into release/2.0beta

* develop:
  理清异常捕获
测试q.js错误处理
修复日期解析的bug
Merge branch 'develop' into release/2.0beta

* develop:
  修复日期解析的bug
  测试q.js错误处理
Merge branch 'release/2.0beta'

* release/2.0beta:
  修复日期解析的bug
  测试q.js错误处理