user membership check added
add some js around websockets connection
Merge remote-tracking branch 'origin/master'