Merge branch 'master' into two-columns-layout
Merge branch 'master' into two-columns-layout
Add third (0) column for stats and menu
cleanup
Add account to Preferences
Add account tests
Add account show on Prefs screen
Merge branch 'two-columns-layout'