Already done. ^_^
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/site/palletManagement.xhtml
will deploy
Fixed bug.