Merge branch 'master' of https://github.com/DIVERSIFY-project/sosies-generator into Multisosie

Conflicts:
	src/main/java/fr/inria/diversify/codeFragmentProcessor/StatementProcessor.java
	src/main/java/fr/inria/diversify/diversification/Diversify.java