HR-314 fix and HR-293 improvement
Merge pull request #482 from monishdeb/HR-314

HR-314 fix and HR-293 improvement
Update enableDisable for 4.5
Merge branch 'master' of git://github.com/civicrm/civihr into HR-296
--HR-296 Modification for string literal