Database Updated
Salary Generation final
Payroll Final Changes
week off setting and leave request prototyping
Merge branch 'master' into experiments

Conflicts:
	functions.php
	modules/leave/add_holidays.php
	modules/leave/config.php
	modules/leave/functions.php
	modules/leave/weekoff.php