subiendo cambios en ViewPedido
Merge remote-tracking branch 'origin/master'

Conflicts:
	nordismobile/src/com/panzyma/nm/view/ViewPedido.java