Minor aesthetic changes to header
Fixed the edit emergency contact stuff
Fixed conflict
Merge https://github.com/the-river/ResearchDatabase
Fixed edit patient form action.