updated doctrine
Fixed some tests
Merge remote-tracking branch 'origin/develop' into feature/page-refactor
Updated composer + fixed tests