worked on new  patient view
fixed merge conflicts
Merge branch 'feature/backend' of https://github.com/betkom/matsi into feature/backend