Merge tag '2.1.1' into develop

Version 2.1.1
Merge branch 'master' into develop
Implement new EntityDataProvider::getEmptyFilterOptionCollection
Generate type safe entities.
Merge branch 'release/2.2'