Merge remote-tracking branch 'origin/simon' into compact_logger

Conflicts:
	src/main/java/fr/inria/diversify/sosie/logger/Instru.java
	src/main/java/fr/inria/diversify/sosie/logger/InstruTestAndMethod.java
	src/main/java/fr/inria/diversify/sosie/logger/processor/AbstractLogginInstrumenter.java
	src/main/java/fr/inria/diversify/sosie/logger/processor/MethodLoggingInstrumenter.java
Merge remote-tracking branch 'origin/simon' into compact_logger

Conflicts:
	src/main/java/fr/inria/diversify/sosie/logger/Instru.java
	src/main/java/fr/inria/diversify/sosie/logger/InstruTestAndMethod.java
	src/main/java/fr/inria/diversify/sosie/logger/processor/AbstractLogginInstrumenter.java
	src/main/java/fr/inria/diversify/sosie/logger/processor/MethodLoggingInstrumenter.java

- Brute hit count