Membership bits 6Dec12
PV use productUser, upc VARCHAR, GeneralCosts
Ontario Meal Tax Rebate
$FANNIE_COOP_ID and receipt re-print
PVarg
CustomerCount revised
DepartmentMovement new col-head-sorts
GeneralSales with Other Dates
PV with argument before or after
per_coop in navbar
fannie/item
Bad Swipe detection in ID Tech driver
Merge remote-tracking branch 'flathat/master'

Conflicts:
	fannie/install/index.php
	fannie/mem/modules/MemCard.php
	fannie/reports/CustomerCount/index.php
	fannie/reports/GeneralSales/index.php
	fannie/src/functions.php
	fannie/src/header.html
	fannie/src/navbar.html
	fannie/sync/index.php
	pos/is4c-nf/gui-modules/productlist.php
	pos/is4c-nf/lib/Database.php
	pos/is4c-nf/lib/PrehLib.php
	pos/is4c-nf/lib/TransRecord.php
	pos/is4c-nf/parser-class-lib/parse/Steering.php
FIX: Lookup vendor name rather than forcing UNFI