Merge remote branch 'upstream/master'

* upstream/master:
  Bugfix: % discount on force qtty items
tiny things 7Jun12
Merge remote branch 'origin/master'

* origin/master: (78 commits)
  Bugfix: % discount on force qtty items
  Allow shelftags w/o super departments
  Patch for first super department
  Fixed check listing for WFC deposit slips
  Tinkering w/ mercury integration
  Working documentation toc
  Line-itme percent discount for sales
  Allow scan on nosale
  Performance fixes for loading YTD patronage
  Fiddling with YTD patronage speedup reload
  Same footers regular & reprint receipt
  Allow login by UPC scan
  BUGFIX: TT{Enter} doesn't cause a tender out
  BUGFIX: Apostrophe in Traveler's check tender
  Percent Discount fix(es)
  Need check counts again
  merge update
  BUGFIX (BANDAID!) for continuous beep while waiting for a weight
  bugfix testing
  bugfix test
  ...
Test of commit from lane
MySQL fix in stock report
Add checks back to deposit tools
Merge remote-tracking branch 'joel/master'
BUGFIX: Quantity enforced group pricing
Bugfix: don't overwrite special order contact info
if phone exists but street is empty
Remove default for call-to-confirm on ordering
Add checks back into deposits
Table name case correction in batches
Table name change correction in vendor pricing
ssd rewritten to run more efficiently and use configuration file
ignore ssd, scanner, scale files
undo memberCardsView
Merge branch 'master' of github.com:joelbrock/IS4C
rcpt: fix for centering BIG text
Merge branch 'master' of github.com:joelbrock/IS4C
rcpt: remove extra !'s and don't display the nonMemNumber in rcpt. footer
Merge branch 'master' of github.com:joelbrock/IS4C
reprint:  removed double $$ and fixed duplicated totals for tendered transactions, cancelled trans now show as $0 in list
Merge branch 'master' of github.com:joelbrock/IS4C
rp:  commented out line that was overwriting actual memID w/ nonMemID