Re-enable websocket
Merge branch 'develop' into feature/daemon
Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
Merge branch 'develop' into feature/daemon
Merge branch 'develop' into feature/daemon
Continue WebSocket development; Re-introduce Guava EventBus
Working fileTree WS request/response
Moving things around
Add XML root names as type distinguisher
Playing around with binary data in websocket return
Add websocket file transfer test to web/js client
Playing around with websocket/js-based download
Merge branch 'develop' into feature/daemon
Merge branch 'develop' into feature/daemon
Merge branch 'develop' into feature/daemon
Merge branch 'feature/daemon' of github.com:syncany/syncany into feature/daemon
Merge branch 'develop' into feature/daemon
Merge branch 'develop' into feature/daemon
Merge develop
Merge branch 'develop' into feature/daemon