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

Conflicts:
	src/se/jiv/webshop/main/Login.java
JLP --> Final version sprint2