Tests added
Merge branch 'master' of https://github.com/TobiasScharnowski/OrderIT

Conflicts:
	src/main/java/orderit/model/exception/ReturnCode.java
	src/main/java/orderit/model/service/impl/EditCatalogueService.java
	src/test/java/orderit/test/G100EditCatalogueTest.java