Minor updates
...
App.yaml and Settings.py fixed
Merge branch 'jon'

Conflicts:
	app.yaml
	settings.py