JLP --> Code revised
Merge branch 'master' of https://github.com/Florry/webshopProject.git

Conflicts:
	src/se/jiv/webshop/repository/dao/UserDAO.java
	test/se/jiv/webshop/test/UserJUnit.java