Merge pull request #726 from NileemaJadhav/HR-14-fixes

--Handle upgrade and install/uninstall bugs
--Add Is paid field for pay screen