Merge remote-tracking branch 'upstream/master'

Conflicts:
	pos/is4c-nf/gui-modules/pos2.php
	pos/is4c-nf/install/index.php
	pos/is4c-nf/lib/PrehLib.php
	pos/is4c-nf/lib/ReceiptLib.php
	pos/is4c-nf/lib/Scanning/SpecialDepts/EquityEndorseDept.php
	pos/is4c-nf/lib/Scanning/SpecialDepts/EquityWarnDept.php
	pos/is4c-nf/plugins/Paycards/gui/paycardSuccess.php
	pos/is4c-nf/plugins/Plugin.php
	pos/is4c-nf/scale-drivers/drivers/rs232/posd.sh
	pos/is4c-nf/scale-drivers/drivers/rs232/posdriver-ssd-debian
	pos/is4c-nf/scale-drivers/drivers/rs232/ssd
	pos/is4c-nf/scale-drivers/drivers/rs232/ssd.c
	pos/is4c-web/cron/expireProducts.php
	pos/is4c-web/cron/nightly.php
	pos/is4c-web/cron/pending.php
	pos/is4c-web/gui-class-lib/BasicPage.php
	pos/is4c-web/gui-modules/confirm.php
	pos/is4c-web/gui-modules/storefront.php
	pos/is4c-web/install/index.php
	pos/is4c-web/is4c.css
	pos/is4c-web/lib/SQLManager.php
	pos/is4c-web/lib/additem.php
	pos/is4c-web/lib/connect.php
	pos/is4c-web/lib/notices.php
	pos/is4c-web/src/template/footer.html