SFDC - Lead Convert
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	lib/apiLimo.class.php
SFDC - Mail Issue
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/controller/operator_quote_dashboard.inc.php
	lib/apiLimo.class.php