Merge branch '5.0'

* 5.0:
  Removed built in web server (it was re-introduced in a merge conflict)

Author: wouterj