--fixes to show activity of type evaluation in edit profile
Merge pull request #596 from divya-jose/evaluation

--fixes to show activity of type evaluation in edit profile
HR-378 Modificaiton for cost calucalation report and current employee report
--Tweak
--Modification for job role department field
Merge branch 'master' of git://github.com/civicrm/civihr into HR-13-fix
Merge pull request #592 from NileemaJadhav/HR-378-work

HR-378 Modificaiton for cost calucalation report and current employee report
Merge pull request #595 from NileemaJadhav/HR-13-fix

--Notice fixes
Merge branch 'master' of git://github.com/civicrm/civihr into HR-13-fix
HR-377 test cases fixes according to HR-378 report changes