--HR-393 General screen changes
code to add contract file
--minor fixes
--fixes
--fixes for report and search
Merge pull request #683 from NileemaJadhav/HR-396-hour

--HR-396  Hour type option related changes
Merge pull request #661 from divya-jose/HR-393

Hr 393
--HR-396 Modification to display FTE in fraction
--HR-396 changes for FTE calculation
Merge pull request #682 from NileemaJadhav/HR-396-fte

--HR-396 Modification to display FTE in fraction
--HR-393 handle upgrade and option group related changes
Merge pull request #684 from PoonamNalawade/Hr393

--HR-393 handle upgrade and option group related changes
--HR-396 modification for option value change and FTE for hours