SFDC Update Gratuity
Merge branch 'master' of https://github.com/hardik-panchal/wakeup

Conflicts:
	instance/front/controller/driver_gratuitie_report.inc.php