Edited settings for google app engine.
Merge branch 'dev'