Fixed other problems on the daemon and broker and recovering javascript
Merge branch 'master' of https://github.com/ptal/online-broker
Fixing some more problems