Updated files, fixed calendar.js