Merge branch 'dev' into 238-improve-searching

enzevalos_iphone.xcodeproj/project.pbxproj

enzevalos_iphone/AppDelegate.swift

enzevalos_iphone/DataHandler.swift

enzevalos_iphone/EnzevalosContact+CoreDataClass.swift

enzevalos_iphone/EnzevalosContact+CoreDataProperties.swift

enzevalos_iphone/ExportInfoViewController.swift

enzevalos_iphone/Folder+CoreDataClass.swift

enzevalos_iphone/Folder+CoreDataProperties.swift

enzevalos_iphone/HeaderExtractionValues.swift

enzevalos_iphone/InboxViewController.swift

enzevalos_iphone/IntroInfoButton.swift

enzevalos_iphone/KeyRecord+CoreDataClass.swift

enzevalos_iphone/ListViewController.swift

enzevalos_iphone/MailServerConnectionError.swift

enzevalos_iphone/MailSession.swift

enzevalos_iphone/Mail_Address+CoreDataClass.swift

enzevalos_iphone/Mail_Address+CoreDataProperties.swift

enzevalos_iphone/Onboarding.swift

enzevalos_iphone/OutgoingMail.swift

enzevalos_iphone/PersistentKey+CoreDataClass.swift