Added modular DAL, updated gluon imports to new structure
Re-implemented copyreg picklers/unpicklers for DAL and Reference classes (due to errors on sessions)
Fixed gluon.tests.dal_nosql with new imports
Updated DatabaseStoredFile to latest web2py master
Updated from latest web2py master
added tests for gluon/html.py and gluon/serializers.py

uhm
Merge branch 'master' into DAL-modular

* master: (58 commits)
  changed version number
  better types by default, given that we're on 2005 at least
  fix for StorageList and tests added
  improved coverage, fix bug with IS_LIST_OF and items not being strings
  fix cache.increment, added tests
  R-2.9.11
  reverted simplejson
  R-2.9.10
  upgraded memcache and markdown2
  upgraded pypyodbc.py
  upgraded simplejson
  no more split in contains, thanks Niphlod
  fixed wording and bug on contains(), made smart_query use ilike instead of like
  ilike, thanks Niphlod
  CROSS JOIN, thanks jotbe
  added custom represent to GoogleDatastoreAdapter, thanks Alan
  postgresql: identifies what adapter auto-loads json values
  added more tests for json Field
  fixed typo in driver_auto_json
  Improve the graphing to show the name of the application.
  ...

Conflicts:
	gluon/dal.py
	gluon/globals.py
	gluon/tests/test_dal.py
Fixed merge conflict
MSSQL3 types
Fix baseAdapter
Fixed globals
always stringify decimals. Better docstrings and a few PEP8.
fixes issue 1985

plus made a pass to jsbeautifier for improved reading
plus fixed an annoying trailing comma that could cause issues with IE >= 8
Merge pull request #506 from niphlod/tests/html_and_serializers

added tests for gluon/html.py and gluon/serializers.py
Merge pull request #507 from ilvalle/master

hooks panel in appadmin for _before_*/_after_* callbacks
hooks panel in appadmin for _before_*/_after_* callbacksm thanks Paolo valleri
Merge pull request #509 from niphlod/fix/json_and_decimals

always stringify decimals. Better docstrings and a few PEP8.
Merge pull request #510 from niphlod/fix/1985

fixes issue 1985
Merge pull request #486 from gi0baro/DAL-modular

Added modular DAL, updated gluon imports to new structure
another attempt at added ssl option for tornado #511