Merge con tu código Verduzco
Agregar botón de entregado
Merge branch 'master' of https://github.com/donverduras/deliverMe

Conflicts:
	coreData/DetailViewController.m
	coreData/en.lproj/DetailViewController.xib