some refactoring of the apam schema, removed unused elements, added <override>
Merge branch 'master' of github.com:AdeleResearchGroup/ApAM