debugging
tweaks to fix merge issues
Merge branch 'develop' of https://github.com/phyllers/GAE_Django17 into develop
moved libraries to lib directory
removed put pem key in gitignore
Merge branch 'feature/lib-cleanup' into develop
conflicts resolved