Update composer versions
Move the not deleted methods around
Merge branch 'dev-v2.2'

Conflicts:
	composer.json
	src/NinjaServiceLayer/Entity/AbstractNeverDeletedEntity.php
	src/NinjaServiceLayer/Service/AbstractService.php