django rice but needs rest service fix
Merge branch 'master' into tom
rice template file additions
rice template file additions 2