Fixed CalendarPanel.java deletion
Merge branch 'dev' of http://github.com/tomorrow-nf/wpi-suite-team5 into dev
CalendarPanel commit attempt 2