ajout des glypicons + intranet pdf
fix merge controller