Changes to fix the date issue, this version still has problem when deployed to the GAE