md-pedido-20141110-01

refrescando la lista al editar o agregar
Merge remote-tracking branch 'origin/master'

Conflicts:
	nordismobile/src/com/panzyma/nm/CBridgeM/BConfiguracionM.java