Teclado numerico automatico
ultimo cambio layout
Merge remote-tracking branch 'choose_remote_name/master' into uo21

Conflicts:
	res/layout/fragment_twos_complement.xml