add VBO, update views pdf rules to use our templates
Merge branch 'master' into production