Fixed user group add/edit/delete and user expiry date format
Merge branch 'master' of github.com:hrisproject/hris