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

--Upgrade failure fix
Merge branch 'master' of git://github.com/civicrm/civihr into HR-14-fixes
-- Version fixes for 1.4