Merge origin/master

Conflicts:
	src/Interface/GUI_A_Articulo.java