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

Conflicts:
	nbproject/private/private.xml
Price Engine Grid
Merge branch 'master' of https://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/config.inc.php