Merge pull request #7 from astaxie/develop

Fixed context import for deploying to GAE