RICE: Batch working with Django Templates
Merge branch 'jon' into sprint7
Merge branch 'sprint7' of https://github.com/puruckertom/ubertool_src into sprint7
Fixing issues with Terrestrial Toxicity input page