Merge branch 'imap-changes' of https://github.com/stonerl/apps into imap-changes

Conflicts:
	user_external/lib/imap.php