Merge branch 'refs/heads/imap_sort' into private_branch

Conflicts:
	Source/CTCoreFolder.h
	Source/CTCoreFolder.m
	Source/MailCoreUtilities.h
	Source/MailCoreUtilities.m
Merge branch 'refs/heads/outgoing_priority_header' into private_branch