lol
Merge branch 'master' of https://github.com/The-White-Sock/PFE

Conflicts:
	src/gui/capture/Config.java
j
Apres le merge, sous linux, j'ai rajouté le kill de script lors de la fermeture du player avec echap Merge branch 'master' of https://github.com/The-White-Sock/PFE

Conflicts:
	src/gui/capture/Config.java
	src/gui/player/SuperPlayer.java
	src/util/files/UtilitiesFiles.java