Ajout des programmes installé
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/scripts/SnmpDevice.js