settings/rls update
Updated app.yaml
Settings change (minor)
Removed app.yaml from gitignore
Merge branch 'jon'

Conflicts:
	app.yaml
	settings.py