change master
Merge branch 'master' of https://github.com/joffroy59/testSubModuleA into evo1

Conflicts:
	testSubModuleA/src/main/java/testSubModuleA/Application.java