Merge pull request #613 from theresaanna/master

subterp template section tag id should match URL
rewriting diff drop down update