adding pages
updating files
adding page links
adding Ean
conflicts resolved