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