Started to work on the main page search box, not finished
Merge remote-tracking branch 'origin/master'