Fix for sanitize('&#x27;') returning '&amp;#x27;' instead of '&#x27;'
fixed remaining methods in HTMLParser that were still using the old htmllib.HTMLParser interface
pg8000 doesn't support json at all
Cleanup: Removed presumed debug print statement.
fixes issue 1998
some freezers publish also __file__ in globals()
Merge pull request #531 from leonelcamara/apostrophe_fpdf

Fix for sanitize('&#x27;') returning '&amp;#x27;' instead of '&#x27;'
Merge branch 'fix/pg8000' of https://github.com/niphlod/web2py into niphlod-fix/pg8000
Merge branch 'niphlod-fix/pg8000'
Merge pull request #533 from jotbe/master

Cleanup: Removed presumed debug print statement.
Merge pull request #534 from niphlod/fix/1998

fixes issue 1998
Merge pull request #535 from niphlod/fix/binaries_switch

fix binaries build. thanks @David Ripplinger
Merge pull request #1 from web2py/master

Syncing with upstream.
Modified DAL and DB2 adapter to allow use of the official ibm_db_dbi driver or ODBC.
Fixed missing update for new DAL structure

Other values were updated in 5e5e649c28a4f3615f917cec3476f0c32e358777 but this was missing from that commit.
Allow URI for ibm_db_dbi driver to user lower or upper case params.
Merge pull request #537 from btreecat/master

Add option of using offical ibm_db_dbi driver instead of ODBC driver for DB2
fixed heorku order of install, thanks Jay
Merge pull request #536 from henrynguyen7/patch-1

Fixed missing update for new DAL structure