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