Refactor bugfix
Build Javascript with new r.js version
More development details in README.md