Hotfix old workspaces not loading

Fixes #692, #693
Merge branch 'master' of git.assembla.com:faraday
Merge branch 'master' of https://github.com/infobyte/faraday