report changes
Merge branch 'master' of https://github.com/SWDINVENTORY/Silang-Inventory

Conflicts:
	front/page/report.php