Design
Merge remote-tracking branch 'origin/master'

Conflicts:
	telecommande/src/fr/fladajonesjones/MediaControler/Application.java