fixed most remaining failing tests, except occasional phantomJS bugs
Merge branch 'master' of github.com:federicomaffei/WorkMap