substitution
Substitution ...
Merge branch 'master' of https://github.com/AdeleResearchGroup/ApAM

Conflicts:
	plugins/apam-maven-plugin/pom.xml