some code cleanup
Fix classpath file.
Fix class path file again.
fix classpaths
Bug fixes.
Merge branch 'master' into release/v7.0

* master:
  fixed some crash in webview
Merge branch 'release/v7.0'