Bug fix when creating a map between AAP structures that are slightly different versions
Merge branch 'devel-share' of https://github.com/rhodricusack/automaticanalysis into devel-share