Changed to java.util calendar system

Changed the system to use java.util calendar system instead.
"Manual" merge regarding calendar system

"Manually" merged changes from master into this branch. The change is
the switch from the calendar system to the java.util time system.