Merge Domain-Model/master

Conflicts:
	src/main/java/com/banda/truckmanagementmodel/model/cargo/FullTruckLoad.java