Finished all tests for UserHandler (without db)
Merge branch 'master' into sara

Fixed conflicts
Merge branch 'master' into sara

Conflicts:
	foodinventory/nb-configuration.xml

foodinventory/src/main/java/se/chalmers/foodinventory/user/InventoryUser
.java

foodinventory/src/main/java/se/chalmers/foodinventory/user/UserHandler.j
ava
	foodinventory/src/main/resources/META-INF/persistence.xml
	foodinventory/src/main/webapp/index.xhtml

foodinventory/src/test/java/se/chalmers/foodinventory/user/UserHandlerTe
st.java
Added backing bean for account page
Removed unnecessary field
Added test file for sample product additions
Added a sample user
Added SQL-file with sample data
Merge branch 'master' into oskar
Merge branch 'master' into linnea
Merge and changes to samples
Merge branch 'linnea'
Cleaned some files
Small but critical changes to samples
Merge branch 'master' into linnea
Merge branch 'linnea'
Merge branch 'master' into oskar
Added method searchForProducts
Merge branch 'master' into sara

Conflicts:
	foodinventory/nb-configuration.xml

foodinventory/src/main/java/se/chalmers/foodinventory/jsf/ctrl/LoginCtrl
.java

foodinventory/src/main/java/se/chalmers/foodinventory/jsf/view/LoginBB.j
ava

foodinventory/src/main/java/se/chalmers/foodinventory/product/Product.ja
va

foodinventory/src/main/java/se/chalmers/foodinventory/product/ProductCon
tainer.java

foodinventory/src/main/java/se/chalmers/foodinventory/product/ProductHan
dler.java

foodinventory/src/main/java/se/chalmers/foodinventory/user/InventoryUser
.java

foodinventory/src/main/java/se/chalmers/foodinventory/user/UserHandler.j
ava
	foodinventory/src/main/webapp/WEB-INF/faces-config.xml
	foodinventory/src/main/webapp/index.xhtml
	foodinventory/src/main/webapp/resources/img/banner.jpg

foodinventory/src/test/java/se/chalmers/foodinventory/product/ProductHan
dlerTest.java

foodinventory/src/test/java/se/chalmers/foodinventory/user/UserHandlerTe
st.java
Merge branch 'sara'

Conflicts:
	foodinventory/nb-configuration.xml

foodinventory/src/main/java/se/chalmers/foodinventory/jsf/ctrl/LoginCtrl
.java

foodinventory/src/main/java/se/chalmers/foodinventory/jsf/view/LoginBB.j
ava

foodinventory/src/main/java/se/chalmers/foodinventory/product/Product.ja
va

foodinventory/src/main/java/se/chalmers/foodinventory/product/ProductCon
tainer.java

foodinventory/src/main/java/se/chalmers/foodinventory/product/ProductHan
dler.java

foodinventory/src/main/java/se/chalmers/foodinventory/user/InventoryUser
.java

foodinventory/src/main/java/se/chalmers/foodinventory/user/UserHandler.j
ava
	foodinventory/src/main/webapp/WEB-INF/faces-config.xml
	foodinventory/src/main/webapp/index.xhtml
	foodinventory/src/main/webapp/resources/img/banner.jpg

foodinventory/src/test/java/se/chalmers/foodinventory/product/ProductHan
dlerTest.java

foodinventory/src/test/java/se/chalmers/foodinventory/user/UserHandlerTe
st.java