Fixed classpath.
Fixed merge errors.
Cleanup in UPnPService.