Merge branch 'hotfix/beer_ordering'
removed contenteditable from menu
redone wine menu with additions
#noswag
Merge branch 'hotfix/wine' into develop