Merge origin/master

Conflicts:
	blaze-ee-utils/src/main/java/com/blazebit/persistence/impl/AbstractCriteriaBuilder.java
	blaze-ee-utils/src/main/java/com/blazebit/persistence/impl/PaginatedCriteriaBuilderImpl.java
	blaze-ee-utils/src/main/java/com/blazebit/persistence/impl/SelectManager.java