added a TemplateRenderer component
fixed page query object, cleanup
Merge pull request #151 from lexoyo/develop

Develop