refactored getNow() into it's own timeService and also introduced timeServiceMock for easy testability
Merge branch 'master' into gh-pages