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

Conflicts:
	fuel/app/classes/controller/salaries.php
Export to excel done
resolved merge issues
resolve merge