Masterserver show privs and js autoload
Merge remote-tracking branch 'upstream/master' into masterserver
Masterserver fixes