Fixed minor bug on Calendar view

Fixed an issue where the workload does not display properly
Fixed the fix
Merge branch 'master' of https://github.com/QJiePing/cs2103aug2014-w10-2j