Merge branch 'master' into Seb

Conflicts:
	programme/dist/views/detail-mission.html
	programme/dist/views/fiche-produit.html
Merge branch 'master' into Seb
Merge branch 'master' into Seb
Merge branch 'master' into Seb
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml