Merge pull request #2 from Geodan/master

toms werk er in fietsen
bugje in editen
Merge pull request #30 from stvno/master

bugje in editenmergen