more merging

build.gradle

 buildscript {
 	ext {
-		springBootVersion = '1.5.15.RELEASE'
+		springBootVersion = '2.0.4.RELEASE'
 	}
 	repositories {
 		mavenCentral()
@@ -110,9 +110,9 @@ eclipse {
 	}
 }
 
-bootRun {
-	addResources = true
-}
+//bootRun {
+//	addResources = true
+//}
 
 idea {
 	module {

src/main/java/nl/tudelft/ewi/queue/repository/CourseRepository.java

@@ -4,12 +4,12 @@ import com.querydsl.core.types.Predicate;
 import nl.tudelft.ewi.queue.model.Course;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
 import java.util.List;
 
-public interface CourseRepository extends PagingAndSortingRepository<Course, Long>, QueryDslPredicateExecutor<Course> {
+public interface CourseRepository extends PagingAndSortingRepository<Course, Long>, QuerydslPredicateExecutor<Course> {
 
     /**
      * Find all courses

src/main/java/nl/tudelft/ewi/queue/repository/RequestRepository.java

@@ -6,7 +6,7 @@ import nl.tudelft.ewi.queue.model.User;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.repository.CrudRepository;
 
 import java.util.List;