Merge branch 'master' of github.com:uniplaces/KnpGaufretteBundle