conflict handled
Merge branch 'localdev'
search and patient question added
Merge branch 'localdev'