added curly braces to first if in CaseDiscount.php
made scale, scanner dirs world-writable, added full paths to these in ssd.c (was segfaulting without them), revised posd.sh to contain actual name of ssd service
scanner scale fixes
path fix in ssd.c, modified bottle deposit hardcoding
changes by Rowan
Merge remote-tracking branch 'origin/master'

Conflicts:
	pos/is4c-nf/graphics/is4c.gif
	pos/is4c-nf/gui-modules/memlist.php
	pos/is4c-nf/lib/PrehLib.php
	pos/is4c-nf/parser-class-lib/preparse/CaseDiscount.php
	pos/is4c-nf/scale-drivers/drivers/rs232/posd.sh
	pos/is4c-nf/scale-drivers/drivers/rs232/scale
	pos/is4c-nf/scale-drivers/drivers/rs232/scanner
	pos/is4c-nf/scale-drivers/drivers/rs232/ssd
	pos/is4c-nf/scale-drivers/drivers/rs232/ssd.c
Revert "changes by Rowan"

This reverts commit b8743dcfbaa683b7bd582e9529d147b982ab894d.
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit e897275850248fe8ec2e3933aac0d11ceb957987, reversing
changes made to b8743dcfbaa683b7bd582e9529d147b982ab894d.
changes by Rowan