Debugging some stuff
Merge branch 'master' of github.com:TBITracker/taskplanner
Fix to calendar highlighting