bugfix and upgrade jcalendar