Conflicts: library/ZendAfi/View/Helper/IconeSupport.php library/ZendAfi/View/Helper/ReseauxSociaux.php