Revert "render master view search form in application layout and remove it from index and search view of master view"

This reverts commit cc7d311b0ca12f1cb9a94c0a631f1bfa2828a05d.
Merge branch 'master' into developer/amrit