fixes
Merge branch 'master' of https://github.com/damarev/laravel-kitchen

Conflicts:
	app/src/Acme/Entities/BaseEntity.php
	app/views/pokemons/show.twig