Merge branch 'master' of github.com:chewbacco/symfony-cookbook

Conflicts:
	README.md
Merge branch 'master' of github.com:chewbacco/symfony-cookbook into feature/fix-tests
Merge branch 'master' of github.com:chewbacco/symfony-cookbook into feature/fix-tests
rubocop fix
Merge pull request #7 from chewbacco/feature/fix-tests

Feature/fix tests