Merge conflicts
Merge branch 'master' of https://github.com/befreeit/superrecords
Merge branch 'master' of https://github.com/befreeit/superrecords
Officer details issue