Migrated from java.util.Calendar to Joda Time, consequence changes,
bugfixes and adaptation of tests.