Merge branch 'development' into feature/#51-import-from-artemis

# Conflicts:
#	package.json
#	src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java
#	src/main/java/at/ac/uibk/gitsearch/web/rest/ExerciseResource.java
#	src/main/webapp/app/bookmarks/bookmarks.component.ts
#	src/main/webapp/app/core/core.module.ts
#	src/main/webapp/app/exercise/service/exercise.service.ts
#	src/main/webapp/app/search/search.component.ts