merge test conflicts

spring-rest-angular-pagination/src/main/resources/application.properties

@@ -1 +1 @@
-server.contextPath=/StudentDirectory
+server.contextPath=/

spring-rest-angular-pagination/src/main/webapp/view/app.js

@@ -17,6 +17,7 @@ app.controller('StudentCtrl', ['$scope','StudentService', function ($scope,Stude
     paginationPageSizes: [5, 10, 20],
     paginationPageSize: paginationOptions.pageSize,
     enableColumnMenus:false,
+	useExternalPagination: true,
     columnDefs: [
       { name: 'studentId' },
       { name: 'name' },

spring-rest-angular-pagination/src/test/java/org/baeldung/web/service/StudentServiceTest.java

@@ -19,7 +19,7 @@ import static org.hamcrest.core.IsEqual.equalTo;
 @IntegrationTest("server.port:8888")
 public class StudentServiceTest {
 
-    private static final String ENDPOINT = "http://localhost:8888/StudentDirectory/student/get";
+    private static final String ENDPOINT = "http://localhost:8888/student/get";
 
     @Test
     public void givenRequestForStudents_whenPageIsOne_expectContainsNames() {