Added error message display when editing patient contact info or demographics fails - RA-164
Merge remote-tracking branch 'upstream/master'