Merge branch 'master' into sara
Conflict fix
Merge branch 'master' into sara

Conflicts:
	foodinventory/src/main/webapp/WEB-INF/faces-config.xml
Merge branch 'master' into sara
Merge branch 'master' into sara
Small fixes
Added the product list with nav on inventory page
Merge branch 'sara'
Merge branch 'master' into oskar and implemented recipe stuff