merge puissant
Merge branch 'master' of https://github.com/TLIgbto/VLC

Conflicts:
	src/com/vlc/ui/Fenetre.java
	src/com/vlc/ui/NorthPan.java
	src/com/vlc/ui/PrincipalPan.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/vlc/ui/Fenetre.java
	src/com/vlc/ui/NorthPan.java
	src/com/vlc/ui/PrincipalPan.java