Merge branch 'master' of github.com:cringer/symfony2-quickstart
Merge branch 'master' of github.com:cringer/symfony2-quickstart