Remove doctrine package and update composer.lock
Merge branch 'bugfixes'