SQL
Merge branch 'master' of https://github.com/hardik-panchal/brilliant
CTA Mail
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/tpl/operatordashboard.php