Merged X-Services with Rest-Dlf connector
Made UpdateUserService authenticate on server
Fixed conflicts

Generally improved logic structure