removed old code
Allow Admin super user
Remove extra friendly lookup
added websocket comment
Merge branch 'origin/websocket'
Merge branch 'origin/dev'