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

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