Merge branch '2' into 3

# Conflicts:
#	code/Controller/AssetAdmin.php
#	code/Controller/AssetAdminFieldsExtension.php
#	code/GraphQL/FileFilter.php
#	code/GraphQL/Notice.php
#	code/GraphQL/Resolvers/AssetAdminResolver.php
#	code/GraphQL/Resolvers/FieldResolver.php
#	code/GraphQL/Resolvers/FileTypeResolver.php
#	code/GraphQL/Resolvers/FolderTypeResolver.php
#	code/GraphQL/Resolvers/PublicationResolver.php
#	code/GraphQL/Schema/Builder.php
#	composer.json