nettoyage code controlleur angular
Merge branch 'dev' into intranet
intranet pr
Merge branch 'dev' into intranet
Merge branch 'dev' into intranet
Ajouter André dans les alertes de nuit
Merge branch 'dev' into intranet
intranet
Merge branch 'dev' into intranet

Conflicts:
	MainApplication/public/stylesheets/app.less
Intranet
Merge branch 'dev' into intranet
Intranet
Merge branch 'dev' into intranet
Intranet
Merge branch 'dev' into intranet
Merge branch 'dev' into intranet
News draft
News
Changer la couleur du lien désactiver
Intranet