[IMP] merge from development

This branch fixes two functional issues
- better check for overlapping relations
- edit relations within a popup

And improves some poorly phrased dutch translations