Sync Changes
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/controller/importdriver.inc.php
	lib/utils.php