Conflicts:
	src/main/java/at/ac/uibk/gitsearch/web/rest/SearchResource.java
	src/main/webapp/app/account/settings/settings.component.html
	src/main/webapp/app/core/icons/font-awesome-icons.ts
	src/test/java/at/ac/uibk/gitsearch/service/SearchServiceIT.java

thumbs_up button implementation

See merge request sharing/codeability-sharing-platform!54

Merge branch 'thumbs_up' of https://sharing-codeability.uibk.ac.at/sharing/codeability-sharing-platform into thumbs_up

against unauthorized users

against unauthorized users

Conflicts:
	.yo-rc.json
	package-lock.json
	src/main/resources/config/liquibase/master.xml
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.html
	src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts
	src/main/webapp/app/search/search.component.ts
	src/main/webapp/i18n/de/global.json

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/ElasticSearchTestServerConfiguration.java
	src/test/java/at/ac/uibk/gitsearch/service/InfoMailServiceIT.java
	src/test/java/at/ac/uibk/gitsearch/service/UserWatchListServiceIT.java
	src/test/java/at/ac/uibk/gitsearch/web/rest/UserWatchListResourceIT.java

Resolve "Extend  Bookmarklists and implement stored searches"

See merge request sharing/codeability-sharing-platform!52