fixed sign in
Created a Recipe class, not functional yet
Merge branch 'master' into oskar
Added recipe files
Implemented recipehandler
Added method to check if a user can cook the recipe
Updated InventoryItem
Fixed indentation
Removed unnecessary code
Added an "Add new product"-button
Merge branch 'master' into oskar and implemented recipe stuff
Merge branch 'linnea'
recipe base
changed name
Merge branch 'master' into andreas

Conflicts:
	foodinventory/src/main/webapp/WEB-INF/faces-config.xml
	foodinventory/src/main/webapp/WEB-INF/innerTemplate.xhtml
Recipes is hopefully working
Merge branch 'master' into oskar

Conflicts:
	foodinventory/src/main/java/se/chalmers/foodinventory/utils/InventoryItem.java
drop-and-create
Merge remote-tracking branch 'origin/master' into andreas
Started working on the inventory control class