updates to popup for menu icons
merge into dev
arbitrary merge
merge dev with bubba
Merge branch 'dev' of github.com:sushi-group-project/sakura-sushi into dev
merge
api working
fixing address box
tabs updated
 merging mikey
mags
merging
merge conflicts updated
Mikey side box