django rice but needs rest service fix
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
rice template file additions
rice template file additions 2
debug back on
Moved Model Submit JS to scripts_input.js
Merge branch 'jon' into sprint14
BlockUI Model Submit Fix
Updated favicon references
Removed VVM & SWC links (left)
sphinx documentation install 2
generation of sphinx documentation