Merge remote-tracking branch 'origin/development' into

118-implement-collections

Conflicts:
	pom.xml
	src/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java
	src/main/java/at/ac/uibk/gitsearch/domain/UserWatchList.java
	src/main/java/at/ac/uibk/gitsearch/service/UserWatchListQueryService.java
	src/main/java/at/ac/uibk/gitsearch/service/dto/SavedSearchesDTO.java
	src/main/java/at/ac/uibk/gitsearch/service/dto/UserWatchListCriteria.java
	src/main/java/at/ac/uibk/gitsearch/service/dto/UserWatchListDTO.java
	src/main/java/at/ac/uibk/gitsearch/web/rest/CheckResource.java
	src/main/resources/config/liquibase/changelog/20210618151109_added_fields_User.xml
	src/main/resources/config/liquibase/master.xml
	src/main/resources/i18n/messages_de.properties
	src/main/resources/i18n/messages_en.properties
	src/main/resources/templates/mail/info/infoEmail.html
	src/main/webapp/app/entities/user-watch-list/user-watch-list.component.html
	src/test/java/at/ac/uibk/gitsearch/repository/search/testESService/ElasticSearch...