Good luck.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/ese/model/dao/LocationItemsDAO.java
	src/main/java/com/ese/transform/PalletManagementTransform.java
Fixed error