HR-340 fix and additional fixes
Merge pull request #550 from monishdeb/HR-340

HR-340 fix and additional fixes
HR-330: add filter to xml
Merge pull request #552 from yashodha/HR-330

HR-330: add filter to xml
Merge branch 'master' of git://github.com/civicrm/civihr into HR-316-evaluation
HR-316 add evaluation profile on activity form