RICE: Batch working with Django Templates
Merge branch 'jon' into sprint7