fixed calendar bug, code cleanup
Merge branch 'master' of github.com:mbatilando/bkbdtimesheet