worked more on listcategories
Merge branch 'master' of https://github.com/josefinenilsson/Nagelwebbshop

Conflicts:
	addproduct.php