Merge branch 'users' into dev

Conflicts:
	src/main/java/se/chalmers/bestwebapp4eva/ctrl/CategoryConverter.java
	src/main/java/se/chalmers/bestwebapp4eva/dao/BasicEntityCollection.java
	src/main/java/se/chalmers/bestwebapp4eva/dao/ICategoryDAO.java
	src/main/java/se/chalmers/bestwebapp4eva/view/CatalogueBB.java