Merge branch 'master' into sara
Conflict fix
Added add product.xhtml
Addproduct page added, search & add not working
Some small fixes, add works
Search works!
Search results are now ordered by name
Added messages to add product page
Added unit enum and add product method with unit
Added unit support in InventoryItem
Merge branch 'master' into sara

Conflicts:
	foodinventory/src/main/webapp/WEB-INF/faces-config.xml
Added support for unit in addproduct.xhtml
addproductctrl now adds product using users unit
Fixed the drop down with units
Fixed the spaghetti bug
A message is now shown when no results are found
Moved Unit enum to Product class
Added preferred unit to product
merge
Removed some unnecessary code