TRUNK-3967
Merge pull request #927 from felipeq/TRUNK-3967

TRUNK-3967: Added option to unvoid Person on UI
TRUNK-3844 corrected BaseOpenMrsObject equals