update on fancybox and font awesome on images and icon
images update with icons
resolved conflicts
merge resolved