fix psr2 in tests
composer update
Merge branch 'feature/ant-build-xml' into develop