resolved conflicts while sync with master

src/main/java/net/gepafin/tendermanagement/util/Validator.java

@@ -151,6 +151,11 @@ public class Validator {
 		String[] activeProfiles = environment.getActiveProfiles();
 		return Arrays.stream(activeProfiles).anyMatch("production"::equals);
 	}
+	
+	public Boolean isTestProfileActivated() {
+		String[] activeProfiles = environment.getActiveProfiles();
+		return Arrays.stream(activeProfiles).anyMatch("test"::equals);
+	}
 
 	public UserEntity validatePreInstructor(HttpServletRequest request, Long preInstructorUserId) {
 		UserEntity preInstructorUser = userService.validateUser(preInstructorUserId);