Moved settings to PreferenceActivity, made main UI much simpler.
Merge remote-tracking branch 'origin/master'