Merge branch 'master' into linnea
Added navigation case for add product.xhtml
Added useful comments
Small changes and fixes
Small changes and fixes
added back to inventory button

bad placement…
Fixed som error messages
small fixes
Possible to choose shown unit in inventory
really small fixes
Merge branch 'master' into linnea

Conflicts:

foodinventory/src/main/java/se/chalmers/foodinventory/jsf/view/Inventory
BB.java

foodinventory/src/main/java/se/chalmers/foodinventory/utils/InventoryIte
m.java
	foodinventory/src/main/webapp/partials/inventory/addproduct.xhtml
Merge branch 'linnea'
Merge branch 'master' into sara
Removed some deprecated comments
Merge branch 'linnea'
Added some css
Changed header font
Merge branch 'master' into sara
Merge branch 'sara'
merge