Merge branch 'master' of https://github.com/agustinem/SAD

Conflicts:
	SAD/SAD/telefono/NATelefonosViewController.m
resolviendo conflictos
otro cambio
cambios