merge fixed
added new button for editing mode
merge
merged
Merge branch 'master' of github.com:tmbo/Roomplanner