fixed bug with calendar, made FixtureGenerator a Spring component