Add Fixed Trip Name in Multi Quote Module
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/controller/multi_quote.inc.php
	instance/front/tpl/multi_quote.php
	lib/Cartype.class.php