Added and tested functionality to maintain a link to local ids in the Drawing, even when they are updated with a remote, global id.
Merge remote-tracking branch 'origin/master'