signup page fixed
merge fixed
fixed list patient view
fixed conflict