fix path to topology file
Fix save of ServieElement's
Save service element with network
Merge remote-tracking branch 'origin/development' into development