working on equipiment borrowing
Merge branch 'master' of https://github.com/raymond617/Asset_control_system

Conflicts:
	class/Objects.php
	forms/barcode_generator.php
	forms/editApplForm.php
	forms/equipiment_borrowing.php
	functions/FormProcessor.php
	index.php