* 'master' of https://github.com/mnb20/k-9:
High DPI version of archive button icon
Fixed whitespace
Remove TODO
Replaced archive icon. Still a bit crap, but better than my previous attempt.
Added batch buttons for Archive and Move. Made batch buttons configurable.
"Scale-independent Pixels - this is like the dp unit, but it is also
scaled by the user's font size preference. It is recommend you use this
unit when specifying font sizes, so they will be adjusted for both the
screen density and the user's preference." - Android Developer Docs
Added ability to rewrite the string representation used internally to
something "pretty" on export.
Now only settings that have entries is GlobalSettings and
AccountSettings are exported. This prevents export of newer settings
that are left in the preference storage when downgrading.