add przm5
Merge branch 'tao'
fix przm5
settings/rls update
Minor updates
Updated app.yaml
Settings change (minor)
Removed app.yaml from gitignore
...
App.yaml and Settings.py fixed
Merge branch 'jon'

Conflicts:
	app.yaml
	settings.py
Merge branch 'master' into tom