Merge branch 'dev'

Conflicts:
	enzevalos_iphone.xcodeproj/project.pbxproj
	enzevalos_iphone.xcodeproj/project.pbxproj.orig
	enzevalos_iphone/AppDelegate.swift
	enzevalos_iphone/AuthenticationModel.swift
	enzevalos_iphone/AuthenticationScreen.swift
	enzevalos_iphone/AuthenticationViewModel.swift
	enzevalos_iphone/Base.lproj/Main.storyboard
	enzevalos_iphone/CHelpers.swift
	enzevalos_iphone/Certificate.swift
	enzevalos_iphone/MailAccount.swift
	enzevalos_iphone/SMIME.swift
	enzevalos_iphone/SMIMEHelpers.swift
	enzevalos_iphone/SearchHelper.swift
	enzevalos_iphone/Settings.bundle/Acknowledgements.plist
	enzevalos_iphone/SwiftUI/Inbox/Inbox.swift
	enzevalos_iphone/SwiftUI/SupportingViews/MailView.swift
	enzevalos_iphone/SwiftUI/SupportingViews/SearchView.swift
	enzevalos_iphone/c/certificate-helpers.c
	enzevalos_iphone/c/certificate-helpers.h
	enzevalos_iphone/c/general-helpers.c
	enzevalos_iphone/c/generic-helpers.h
	enzevalos_iphone/c/smime-helpers.c
	enzevalos_iphone/c/smime-helpers.h
	enzevalos_iphone/de.lproj/Localizable.strings
	enzevalos_iphone/en.lproj/Localizable.strings
	enzevalos_iphoneTests/GeneratedMocks.swift