nettoyage
Merge branch 'test_lolo' of https://github.com/adelineG/LNantesApp into test_lolo

Conflicts:
	LocateNantes/mainwindow.cpp