added pages en navigation
Merge branch 'anton3'