implemented Repository->findById($id)
Merge branch 'dev/steve' into develop