fixing unit tests
calendar util tests, next event
Merge branch 'master' of https://github.com/compartia/skill2peer.git