Merging jsclient and js

Since jsclient branch's client and js branch's server can work on same directory now, I'm going to merge these two branches.