Testing in shift page
Merge branch 'master' of http://github.com/hardik-panchal/brilliant

Conflicts:
	instance/front/controller/fuel.inc.php
	instance/front/controller/schedulerShiftPlanning.inc.php
	instance/front/tpl/fuel.php
	instance/front/tpl/shift.php