Renamed entities
Renamed entities
Merge branch 'master' into RenamedEntities

Conflicts:
	src/Cocktails/RecipesBundle/Resources/config/admin.yml
Merged
Merged
Merged
Merged
Renamed admin.yml entities
ingredient
Merge branch 'master' of https://github.com/nfqakademija/kokteiliai
Test commit after merge
Test commit after merge