sales report 23/04
config changes
Merge remote-tracking branch 'rkabhib/master'

Conflicts:
	app/Controller/AppController.php
	app/Controller/EmployeeOrdersController.php
	app/Resources/release_1.1.sql