Platform calendar fix

Added in the fix for the platform calendar issues.
Merge branch 'master' of https://github.com/itraycer/mobile
deleted to redo
commit
Revert "deleted to redo"

This reverts commit 2e32339c0a44f4329496d64f2886e02a373748fa.