Record and server and stuff
Merge branch 'master' of https://github.com/grouse/ssl-patientrecords