Operator Dashboard
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	lib/Fixed_trip.class.php