conflict solved at seeds.rb
payslip print and email
abbrevations to capital
leave encashments