Changed to java.util calendar system

Changed the system to use java.util calendar system instead.
Merge remote-tracking branch 'origin/master' into gui