Trip Status Alert
Merge branch 'master' of https://github.com/hardik-panchal/wakeup

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