updating master from origin master
Merge branch 'master' of https://github.com/thomasstephane/eventoverflow
fixed failing tests