Merge pull request #269 from jkuk/master

richard fixed something in calendar panel
uploading changes for richard: