stash changes
userprefs
Merge. Added horizontal scroll in buy/sell dialogs.
cleanup
Merge branch 'master' of github.com:muzzi11/cargo