Fixing quick edit issue
bug fix: calendar issue
Merge pull request #1479 from stevewithington/develop

bug fix: calendar issue