updates
Merge branch 'master' of https://github.com/gilz688/POSS

Conflicts:
	app/tests/unit/SalesReportTest.php
updates
Merge branch 'master' of https://github.com/gilz688/POSS