Fixes Twig controller bug
Merge pull request #585 from citricsquid/database

Fixes Twig controller bug