Merge branch 'develop' of https://github.com/prodos/Conecta into develop

Conflicts:
	AirDrop/ADManager.m