Search box to master page
Merge branch 'beta_build' into Fixes