Merge branches 'master' and 'hrmaster'
removed converting into string
Merge remote-tracking branch 'avinash/master' into hr_master