added payslip generation
Merge branch 'master' of github.com:garimajoshi/payroll

Conflicts:
	fuel/app/views/salaries/payslip.php
Merge branch 'master' of github.com:garimajoshi/payroll
changed primary key for salary