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

Conflicts:
	src/prop/presentacio/CtrlPresentacio.java