Use @Template annotation instead of returning a Response object
Merge branch 'develop' into support/symfony-2.0