Cambio a español agergadas dos etiquetas
panel de calibración cambiado
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/my/pcbmakergui/PCBMakerUI$1.class
	build/classes/my/pcbmakergui/PCBMakerUI$10.class
	build/classes/my/pcbmakergui/PCBMakerUI$11.class
	build/classes/my/pcbmakergui/PCBMakerUI$12.class
	build/classes/my/pcbmakergui/PCBMakerUI$13.class
	build/classes/my/pcbmakergui/PCBMakerUI$14.class
	build/classes/my/pcbmakergui/PCBMakerUI$15.class
	build/classes/my/pcbmakergui/PCBMakerUI$16.class
	build/classes/my/pcbmakergui/PCBMakerUI$17.class
	build/classes/my/pcbmakergui/PCBMakerUI$18.class
	build/classes/my/pcbmakergui/PCBMakerUI$19.class
	build/classes/my/pcbmakergui/PCBMakerUI$2.class
	build/classes/my/pcbmakergui/PCBMakerUI$20.class
	build/classes/my/pcbmakergui/PCBMakerUI$21.class
	build/classes/my/pcbmakergui/PCBMakerUI$3.class
	build/classes/my/pcbmakergui/PCBMakerUI$4.class
	build/classes/my/pcbmakergui/PCBMakerUI$5.class
	build/classes/my/pcbmakergui/PCBMakerUI$6.class
	build/classes/my/pcbmakergui/PCBMakerUI$7.class
	build/classes/my/pcbmakergui/PCBMakerUI$8.class
	build/classes/my/pcbmakergui/PCBMakerUI$9.class
	build/classes/my/pcbmakergui/PCBMakerUI.class
	src/my/pcbmakergui/PCBMakerUI.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/my/pcbmakergui/PCBMakerUI$1.class
	build/classes/my/pcbmakergui/PCBMakerUI$10.class
	build/classes/my/pcbmakergui/PCBMakerUI$11.class
	build/classes/my/pcbmakergui/PCBMakerUI$12.class
	build/classes/my/pcbmakergui/PCBMakerUI$13.class
	build/classes/my/pcbmakergui/PCBMakerUI$14.class
	build/classes/my/pcbmakergui/PCBMakerUI$15.class
	build/classes/my/pcbmakergui/PCBMakerUI$16.class
	build/classes/my/pcbmakergui/PCBMakerUI$17.class
	build/classes/my/pcbmakergui/PCBMakerUI$18.class
	build/classes/my/pcbmakergui/PCBMakerUI$19.class
	build/classes/my/pcbmakergui/PCBMakerUI$2.class
	build/classes/my/pcbmakergui/PCBMakerUI$20.class
	build/classes/my/pcbmakergui/PCBMakerUI$21.class
	build/classes/my/pcbmakergui/PCBMakerUI$3.class
	build/classes/my/pcbmakergui/PCBMakerUI$4.class
	build/classes/my/pcbmakergui/PCBMakerUI$5.class
	build/classes/my/pcbmakergui/PCBMakerUI$6.class
	build/classes/my/pcbmakergui/PCBMakerUI$7.class
	build/classes/my/pcbmakergui/PCBMakerUI$8.class
	build/classes/my/pcbmakergui/PCBMakerUI$9.class
	build/classes/my/pcbmakergui/PCBMakerUI.class
	src/my/pcbmakergui/PCBMakerUI.java