Merge branch 'develop' into shippingOrder

pom.xml

...in/java/no/ntnu/queryeng/controller/ParcelController.java

...in/java/no/ntnu/queryeng/controller/StatusController.java

.../java/no/ntnu/queryeng/controller/TerminalController.java

src/main/java/no/ntnu/queryeng/entity/AdditionalService.java

src/main/java/no/ntnu/queryeng/entity/Customer.java

src/main/java/no/ntnu/queryeng/entity/Invoice.java

src/main/java/no/ntnu/queryeng/entity/Parcel.java

src/main/java/no/ntnu/queryeng/entity/Status.java

src/main/java/no/ntnu/queryeng/entity/ThirdParty.java

...va/no/ntnu/queryeng/repository/AdditionalServiceRepo.java

src/main/java/no/ntnu/queryeng/repository/CustomerRepo.java

src/main/java/no/ntnu/queryeng/repository/InvoiceRepo.java

...in/java/no/ntnu/queryeng/repository/ParcelRepository.java

src/main/java/no/ntnu/queryeng/repository/StatusRepo.java

src/main/java/no/ntnu/queryeng/repository/TerminalRepo.java

...main/java/no/ntnu/queryeng/repository/ThirdPartyRepo.java

src/main/java/no/ntnu/queryeng/service/ParcelService.java

src/main/java/no/ntnu/queryeng/service/StatusService.java

src/main/java/no/ntnu/queryeng/service/TerminalService.java