fixed sign in
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
drop-and-create
Merge remote-tracking branch 'origin/master' into andreas
recipe beans
Merge remote-tracking branch 'origin/master' into andreas
recipe
recipe2
Merge branch 'andreas' into oskar