Merge origin/master

Conflicts:
	src/dlp/control/AddCategoria.java