shavin: made changes with isuru
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	dbAccess.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
added language data to leave management