Optimisation of Jackson
COnflict resolving
COnflict resolving
Merge origin/master

Conflicts:
	POC_Project/src/main/java/ch/heigvd/skeleton/jackson/JacksonConverter.java