Fix loading of Technology tree.Parent was not checked correctly
Merge remote-tracking branch 'origin/development' into development