merde
Merge branch 'master' of https://github.com/greggz/projet-genielog.git

Conflicts:
	src/model/persistence/DBFactory.java
	src/ui/MainWindow.java