Merge remote-tracking branch 'origin/viky-last' into Sami-pagination

Conflicts:
index.html
pages/search.html