Merged to latest revision, modified admin slots from source to admin plugin and added custom event onclientconnecting