imported updated Annex60 base classes based on commit bd523e5a73bee2452eeb95697e6eb2cb06afe9ad
Merge pull request #138 from open-ideas/issue137_importAnnex60

imported updated Annex60 base classes...