fix compilation warnings
fix instrumentation parsing
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM
separate managers : dynamic, failure, conflict
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM