Merge branch 'pdo-fannie-fix-identifier' into oo-fannie-pages

Conflicts:
	fannie/src/SQLManager.php
Merge pull request #133 from CORE-POS/fannie-pdo-patch

Remove strict checks for db type "MYSQL" so alternatives also work
Merge branch 'fannie-pdo-patch' into oo-fannie-pages
Product list report/tool updated to use API classes
Replacement super/regular/sub department editors using
API classes
Merge pull request #134 from CORE-POS/oo-fannie-pages

Oo fannie pages
Merge remote-tracking branch 'origin/master' into akt-master
Initial query re-write
More changes to prepared statements
Mercury rollout fixes (clean token table, better http failure checks)
Merge pull request #135 from CORE-POS/fannie-prep-statements

Fannie prep statements
Mercury rollout fixes (clean token table, better http failure checks)
Use regular dlog for reporting
Modules for receipt construction
Merge resolution
Merge pull request #136 from CORE-POS/summary-table-rollback

Summary table rollback
Merge pull request #137 from CORE-POS/receipt-mods

Receipt mods
Merge remote-tracking branch 'origin/master' into akt-master

Conflicts:
	pos/is4c-nf/lib/ReceiptBuilding/ReceiptSort/DefaultReceiptSort.php
Modular vendor pages
Batch related pages that use API classes (except main batch editor)