Variety fixes#80

pimotte wants to merge 9 commits intomappingimpermeable/waterproof-editor:mappingfrom

feature/reenable-buttonsimpermeable/waterproof-editor:feature/reenable-buttonsCopy head branch name to clipboard