Merge branch 'hotfix/docs_v0.9_beta1' into develop
Fix template for compatibility with Symfony 2.3
Merge pull request #15 from Sorbing/develop

Fix template for compatibility with Symfony 2.3
Merge branch 'release/v1.0.0'