Add from/to address in fixed trip
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/controller/apiTest.inc.php
Add from/to address in fixed trip