Changed GAE settings to fix "The output directory for the project should be set to" error
Merge branch 'master' into webappv2-rewrite