Merge branch 'GSOC_account_setup' into material-1.0-backup

# Conflicts:
#	README.md
#	k9mail-library/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.java
#	k9mail-library/src/test/java/com/fsck/k9/mail/store/imap/ImapConnectionTest.java
#	k9mail-library/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.java
#	k9mail/build.gradle
#	k9mail/src/main/AndroidManifest.xml
#	k9mail/src/main/java/com/fsck/k9/Account.java
#	k9mail/src/main/java/com/fsck/k9/Globals.java
#	k9mail/src/main/java/com/fsck/k9/K9.java
#	k9mail/src/main/java/com/fsck/k9/activity/Accounts.java
#	k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java
#	k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java
#	k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
#	k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java
#	k9mail/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotifications.java
#	k9mail/src/main/res/values-ca/strings.xml
#	k9mail/src/main/res/values-de/strings.xml
#	k9mail/src/main/res/values-eu/strings.xml
#	k9mail/src/main/res/values-fr/strings.xml
#	k9mail/src/main/res/values-pl/strings.xml
#	k9mail/src/main/res/values-pt-rBR/strings.xml
#	k9mail/src/main/res/values-sl/strings.xml
#	k9mail/src/main/res/values-tr/strings.xml
#	k9mail/src/main/res/values/colors.xml
#	k9mail/src/main/res/values/dimensions.xml
#	k9mail/src/main/res/values/strings.xml