Added Patient Search, and Patient Home and Search pages
Fixed merged conflicts from previous commit