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

Conflicts:
	bin/prop/domini/Assignacio.class
	bin/prop/domini/Categoria.class