Merge work on shareJs with work on node-login