Merge origin/master

Conflicts:
	IslandPrimeWEB/src/java/managedbean/KitchenInventoryBean.java
Merge origin/master