Merge branch 'master' into pydal-pip

Conflicts:
	gluon/__init__.py
	gluon/dal/_load.py
	gluon/dal/adapters/base.py
	gluon/dal/adapters/google.py
	gluon/dal/adapters/postgres.py
	gluon/dal/adapters/teradata.py
	gluon/dal/base.py
	gluon/dal/objects.py
	gluon/tests/__init__.py
	gluon/tests/test_dal_nosql.py

gluon/tests/__init__.py

@@ -17,6 +17,7 @@ from test_utils import *
 from test_contribs import *
 from test_web import *
 from test_dal import *
+from test_tools import *
 
 if sys.version[:3] == '2.7':
     from test_old_doctests import *