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

Conflicts:
	src/se/jiv/webshop/main/JLPTestUser.java
JLP --> Null parameters fixed in CategoryDAO