Improve grant preemption
merge remote/master
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM
update property parser to last sspecification
fix test: new schema
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM