Merge branch 'devel' of https://github.com/dwinston/pushpickup into jm-layout
ui spacing alignments
Merge branch 'jm-layout' of github.com:dwinston/pushpickup into jm-layout
fix merge conflicts with Jo