vistes actualitzades
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	src/prop/presentacio/vistaCrearCategoria.java
modif
pene
Merge branch 'master' of https://github.com/hersftw/prop

Conflicts:
	bin/Main.class
Merge branch 'master' of https://github.com/hersftw/prop