working on more calendar gui smells
Merge branch 'master' of github.com:11samype/Swap1-Team3
expanded features