Merge branch 'stephane'

Conflicts:
	src/main/java/miage/m2/controller/ScanController.java
	src/main/java/miage/m2/service/impl/ScanServiceImpl.java
	target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
MySQL
Scan TCP
Merge remote-tracking branch 'origin/stephane'

Conflicts:
	src/main/java/miage/m2/controller/ScanController.java
	src/main/java/miage/m2/service/impl/ScanServiceImpl.java