Merge pull request #236 from apache/fix/sitemesh

Fixes reference to the new filters and update plugins' layout